3 files changed, 5 insertions, 3 deletions
diff --git a/plugins/XSoundNotify/src/dialog.cpp b/plugins/XSoundNotify/src/dialog.cpp
index 68a86ced56..f893d65aab 100644
--- a/plugins/XSoundNotify/src/dialog.cpp
+++ b/plugins/XSoundNotify/src/dialog.cpp
@@ -40,7 +40,7 @@ static INT_PTR CALLBACK DlgProcContactsOptions(HWND hwndDlg, UINT msg, WPARAM wP
 					break;
 				}
 
-				TCHAR *nick = (TCHAR *)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, hContact, GCDNF_TCHAR);
+				TCHAR *nick = (TCHAR *)pcli->pfnGetContactDisplayName(hContact, 0);
 				TCHAR value[100];
 				mir_sntprintf(value, _countof(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 8f70bf6c77..3e528ba273 100644
--- a/plugins/XSoundNotify/src/options.cpp
+++ b/plugins/XSoundNotify/src/options.cpp
@@ -77,7 +77,7 @@ static INT_PTR CALLBACK OptsProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l
 								mir_tstrcpy(uid, TranslateT("(Unknown contact)"));
 							}
 
-							TCHAR *nick = (TCHAR *)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, hContact, GCDNF_TCHAR);
+							TCHAR *nick = (TCHAR *)pcli->pfnGetContactDisplayName(hContact, 0);
 							size_t value_max_len = (mir_tstrlen(uid) + mir_tstrlen(nick) + 4);
 							TCHAR *value = (TCHAR *)mir_alloc(sizeof(TCHAR) * value_max_len);
 							mir_sntprintf(value, value_max_len, _T("%s (%s)"), nick, uid);
diff --git a/plugins/XSoundNotify/src/xsn_main.cpp b/plugins/XSoundNotify/src/xsn_main.cpp
index 8d9a9f078c..dc23fae00a 100644
--- a/plugins/XSoundNotify/src/xsn_main.cpp
+++ b/plugins/XSoundNotify/src/xsn_main.cpp
@@ -16,6 +16,7 @@ HGENMENU hChangeSound = NULL;
 MWindowList hChangeSoundDlgList = NULL;
 BYTE isIgnoreSound = 0, isOwnSound = 0;
 
+CLIST_INTERFACE *pcli;
 CHAT_MANAGER *pci;
 
 PLUGININFOEX pluginInfo = {
@@ -77,7 +78,7 @@ void InitSelfSounds()
 
 			TCHAR infobuf[256];
 			mir_sntprintf(infobuf, _countof(infobuf), _T("%s [%s]"), TranslateT("Self status"), protos[i]->tszAccountName);
-			SkinAddNewSoundExT(namebuf, infobuf, (TCHAR*)CallService(MS_CLIST_GETSTATUSMODEDESCRIPTION, selfSounds[j].iStatus, GSMDF_TCHAR));
+			SkinAddNewSoundExT(namebuf, infobuf, pcli->pfnGetStatusModeDescription(selfSounds[j].iStatus, 0));
 		}
 	}
 }
@@ -208,6 +209,7 @@ static int OnPreShutdown(WPARAM, LPARAM)
 extern "C" int __declspec(dllexport) Load()
 {
 	mir_getLP(&pluginInfo);
+	mir_getCLI();
 
 	CreateServiceFunction("XSoundNotify/ContactMenuCommand", ShowDialog);