CLIST_INTERFACE::pfnGetContactDisplayName => Clist_GetContactDisplayName

3 files changed, 2 insertions, 4 deletions

diff --git a/plugins/XSoundNotify/src/dialog.cpp b/plugins/XSoundNotify/src/dialog.cpp
index 6d96d971e1..283aa78bdb 100644
--- a/plugins/XSoundNotify/src/dialog.cpp
+++ b/plugins/XSoundNotify/src/dialog.cpp
@@ -43,7 +43,7 @@ static INT_PTR CALLBACK DlgProcContactsOptions(HWND hwndDlg, UINT msg, WPARAM wP
 						break;

 					}

 

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

+					wchar_t *nick = Clist_GetContactDisplayName(hContact);

 					wchar_t value[100];

 					mir_snwprintf(value, TranslateT("Custom sound for %s (%s)"), nick, uid);

 					SetWindowText(hwndDlg, value);

diff --git a/plugins/XSoundNotify/src/options.cpp b/plugins/XSoundNotify/src/options.cpp
index cc2d8a51ca..0444d7c155 100644
--- a/plugins/XSoundNotify/src/options.cpp
+++ b/plugins/XSoundNotify/src/options.cpp
@@ -76,7 +76,7 @@ static INT_PTR CALLBACK OptsProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l
 								mir_wstrcpy(uid, TranslateT("(Unknown contact)"));

 							}

 

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

+							wchar_t *nick = Clist_GetContactDisplayName(hContact);

 							size_t value_max_len = (mir_wstrlen(uid) + mir_wstrlen(nick) + 4);

 							wchar_t *value = (wchar_t *)mir_alloc(sizeof(wchar_t) * value_max_len);

 							mir_snwprintf(value, value_max_len, L"%s (%s)", nick, uid);

diff --git a/plugins/XSoundNotify/src/xsn_main.cpp b/plugins/XSoundNotify/src/xsn_main.cpp
index e8ea9d302f..e06c33a311 100644
--- a/plugins/XSoundNotify/src/xsn_main.cpp
+++ b/plugins/XSoundNotify/src/xsn_main.cpp
@@ -16,7 +16,6 @@ HGENMENU hChangeSound = nullptr;
 MWindowList hChangeSoundDlgList = nullptr;

 BYTE isIgnoreSound = 0, isOwnSound = 0, isIgnoreAccSound = 0, isAccSound = 0;

 

-CLIST_INTERFACE *pcli;

 CHAT_MANAGER *pci;

 

 PLUGININFOEX pluginInfo = {

@@ -240,7 +239,6 @@ extern "C" int __declspec(dllexport) Load()
 {

 	mir_getLP(&pluginInfo);

 	pci = Chat_GetInterface();

-	pcli = Clist_GetInterface();

 

 	CreateServiceFunction("XSoundNotify/ContactMenuCommand", ShowDialog);