CLIST_INTERFACE::pfnGetStatusModeDescription => Clist_GetStatusModeDescription

57 files changed, 92 insertions, 92 deletions

diff --git a/plugins/BossKeyPlus/src/Options.cpp b/plugins/BossKeyPlus/src/Options.cpp
index 3ce73335eb..bf973c734a 100644
--- a/plugins/BossKeyPlus/src/Options.cpp
+++ b/plugins/BossKeyPlus/src/Options.cpp
@@ -55,7 +55,7 @@ INT_PTR CALLBACK MainOptDlg(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam
 			CheckDlgButton(hwndDlg, IDC_MAINOPT_TRAYICON, (g_wMask & OPT_TRAYICON) ? BST_CHECKED : BST_UNCHECKED);

 

 			for (int i = ID_STATUS_OFFLINE; i <= ID_STATUS_OUTTOLUNCH; i++)

-				SendDlgItemMessage(hwndDlg, IDC_MAINOPT_CHGSTS, CB_INSERTSTRING, -1, (LPARAM)pcli->pfnGetStatusModeDescription(i, 0));

+				SendDlgItemMessage(hwndDlg, IDC_MAINOPT_CHGSTS, CB_INSERTSTRING, -1, (LPARAM)Clist_GetStatusModeDescription(i, 0));

 

 			SendDlgItemMessage(hwndDlg, IDC_MAINOPT_CHGSTS, CB_SETCURSEL, db_get_b(NULL, MOD_NAME, "stattype", 2), 0);

 

diff --git a/plugins/Clist_blind/src/init.cpp b/plugins/Clist_blind/src/init.cpp
index c0a4e4c062..b5800648a9 100644
--- a/plugins/Clist_blind/src/init.cpp
+++ b/plugins/Clist_blind/src/init.cpp
@@ -425,7 +425,7 @@ wchar_t* GetStatusName(struct ClcContact *item)
 

 	// Get status name

 	status = db_get_w(item->hContact, item->proto, "Status", ID_STATUS_OFFLINE);

-	mir_wstrncpy(status_name, pcli->pfnGetStatusModeDescription(status, 0), _countof(status_name));

+	mir_wstrncpy(status_name, Clist_GetStatusModeDescription(status, 0), _countof(status_name));

 

 	return status_name;

 }

diff --git a/plugins/Clist_modern/src/modern_cachefuncs.cpp b/plugins/Clist_modern/src/modern_cachefuncs.cpp
index 97dc946890..428faca9e7 100644
--- a/plugins/Clist_modern/src/modern_cachefuncs.cpp
+++ b/plugins/Clist_modern/src/modern_cachefuncs.cpp
@@ -293,7 +293,7 @@ int GetStatusName(wchar_t *text, int text_size, ClcCacheEntry *pdnce, BOOL xstat
 	}
 
 	// Get Status name
-	wchar_t *tmp = pcli->pfnGetStatusModeDescription(nStatus, 0);
+	wchar_t *tmp = Clist_GetStatusModeDescription(nStatus, 0);
 	if (tmp && *tmp) {
 		mir_wstrncpy(text, tmp, text_size);
 		return 1;
diff --git a/plugins/Clist_modern/src/modern_clistevents.cpp b/plugins/Clist_modern/src/modern_clistevents.cpp
index bfc45dcb56..0278b00bbb 100644
--- a/plugins/Clist_modern/src/modern_clistevents.cpp
+++ b/plugins/Clist_modern/src/modern_clistevents.cpp
@@ -114,7 +114,7 @@ CListEvent* cli_AddEvent(CLISTEVENT *cle)
 			NotifyMenuItemExData *nmi = (struct NotifyMenuItemExData *) malloc(sizeof(struct NotifyMenuItemExData));

 			if (nmi) {

 				wchar_t szBuffer[128];

-				wchar_t* szStatus = pcli->pfnGetStatusModeDescription(db_get_w(p->hContact, szProto, "Status", ID_STATUS_OFFLINE), 0);

+				wchar_t* szStatus = Clist_GetStatusModeDescription(db_get_w(p->hContact, szProto, "Status", ID_STATUS_OFFLINE), 0);

 				wchar_t szwProto[64];

 				MultiByteToWideChar(CP_ACP, 0, szProto, -1, szwProto, 64);

 				szwProto[63] = 0;

diff --git a/plugins/Clist_modern/src/modern_statusbar.cpp b/plugins/Clist_modern/src/modern_statusbar.cpp
index e0d671598f..c83617b732 100644
--- a/plugins/Clist_modern/src/modern_statusbar.cpp
+++ b/plugins/Clist_modern/src/modern_statusbar.cpp
@@ -247,7 +247,7 @@ int ModernDrawStatusBarWorker(HWND hWnd, HDC hDC)
 		p->tszProtoHumanName = mir_wstrdup(accs[i]->tszAccountName);

 		p->szAccountName = mir_strdup(szProto);

 		p->szProtoName = mir_strdup(accs[i]->szProtoName);

-		p->tszProtoStatusText = mir_wstrdup(pcli->pfnGetStatusModeDescription(p->iProtoStatus, 0));

+		p->tszProtoStatusText = mir_wstrdup(Clist_GetStatusModeDescription(p->iProtoStatus, 0));

 		p->iProtoPos = iProtoInStatusMenu++;

 

 		p->bIsDimmed = 0;

diff --git a/plugins/Clist_modern/src/modern_viewmodebar.cpp b/plugins/Clist_modern/src/modern_viewmodebar.cpp
index f51c72b5ed..78baf5a889 100644
--- a/plugins/Clist_modern/src/modern_viewmodebar.cpp
+++ b/plugins/Clist_modern/src/modern_viewmodebar.cpp
@@ -251,7 +251,7 @@ static int FillDialog(HWND hwnd)
 	for (int i = ID_STATUS_OFFLINE; i <= ID_STATUS_OUTTOLUNCH; i++) {

 		LVITEM item = { 0 };

 		item.mask = LVIF_TEXT;

-		item.pszText = pcli->pfnGetStatusModeDescription(i, 0);

+		item.pszText = Clist_GetStatusModeDescription(i, 0);

 		item.iItem = i - ID_STATUS_OFFLINE;

 		SendMessage(hwndList, LVM_INSERTITEM, 0, (LPARAM)&item);

 	}

diff --git a/plugins/Clist_nicer/src/clistevents.cpp b/plugins/Clist_nicer/src/clistevents.cpp
index 4f3cfee501..bc970f3aa0 100644
--- a/plugins/Clist_nicer/src/clistevents.cpp
+++ b/plugins/Clist_nicer/src/clistevents.cpp
@@ -258,7 +258,7 @@ CListEvent* AddEvent(CLISTEVENT *cle)
 			NotifyMenuItemExData *nmi = (NotifyMenuItemExData*)malloc(sizeof(NotifyMenuItemExData));

 			if (nmi) {

 				wchar_t szBuffer[128];

-				wchar_t* szStatus = pcli->pfnGetStatusModeDescription(db_get_w(p->hContact, szProto, "Status", ID_STATUS_OFFLINE), 0);

+				wchar_t* szStatus = Clist_GetStatusModeDescription(db_get_w(p->hContact, szProto, "Status", ID_STATUS_OFFLINE), 0);

 

 				wchar_t szwProto[64];

 				MultiByteToWideChar(CP_ACP, 0, szProto, -1, szwProto, 64);

diff --git a/plugins/Clist_nicer/src/clui.cpp b/plugins/Clist_nicer/src/clui.cpp
index b2014121ae..a718231025 100644
--- a/plugins/Clist_nicer/src/clui.cpp
+++ b/plugins/Clist_nicer/src/clui.cpp
@@ -255,7 +255,7 @@ static void InitIcoLib()
 	for (int i = IDI_OVL_OFFLINE; i <= IDI_OVL_OUTTOLUNCH; i++) {
 		char szBuffer[128];
 		mir_snprintf(szBuffer, "cln_ovl_%d", ID_STATUS_OFFLINE + (i - IDI_OVL_OFFLINE));
-		IconItemT icon = { pcli->pfnGetStatusModeDescription(ID_STATUS_OFFLINE + (i - IDI_OVL_OFFLINE), 0), szBuffer, i };
+		IconItemT icon = { Clist_GetStatusModeDescription(ID_STATUS_OFFLINE + (i - IDI_OVL_OFFLINE), 0), szBuffer, i };
 		Icon_RegisterT(g_hInst, LPGENW("Contact list") L"/" LPGENW("Overlay icons"), &icon, 1);
 	}
 
@@ -798,7 +798,7 @@ LRESULT CALLBACK ContactListWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM l
 		CluiProtocolStatusChanged(0, nullptr);
 
 		for (int i = ID_STATUS_OFFLINE; i <= ID_STATUS_OUTTOLUNCH; i++)
-			statusNames[i - ID_STATUS_OFFLINE] = pcli->pfnGetStatusModeDescription(i, 0);
+			statusNames[i - ID_STATUS_OFFLINE] = Clist_GetStatusModeDescription(i, 0);
 
 		//delay creation of CLC so that it can get the status icons right the first time (needs protocol modules loaded)
 		if (cfg::dat.bLayeredHack) {
@@ -1708,7 +1708,7 @@ buttons_done:
 					x += textSize.cx;
 				}
 				if (showOpts & 4) {
-					wchar_t *szStatus = pcli->pfnGetStatusModeDescription(status, 0);
+					wchar_t *szStatus = Clist_GetStatusModeDescription(status, 0);
 					GetTextExtentPoint32(dis->hDC, szStatus, (int)mir_wstrlen(szStatus), &textSize);
 					TextOut(dis->hDC, x, (dis->rcItem.top + dis->rcItem.bottom - textSize.cy) >> 1, szStatus, (int)mir_wstrlen(szStatus));
 				}
diff --git a/plugins/Clist_nicer/src/cluiservices.cpp b/plugins/Clist_nicer/src/cluiservices.cpp
index c5567303d9..bc2f0fbfd8 100644
--- a/plugins/Clist_nicer/src/cluiservices.cpp
+++ b/plugins/Clist_nicer/src/cluiservices.cpp
@@ -126,7 +126,7 @@ void CluiProtocolStatusChanged(int, const char*)
 				x += textSize.cx + GetSystemMetrics(SM_CXBORDER) * 4; // The SB panel doesnt allocate enough room

 			}

 			if (showOpts & 4) {

-				wchar_t* modeDescr = pcli->pfnGetStatusModeDescription(CallProtoService(accs[i]->szModuleName, PS_GETSTATUS, 0, 0), 0);

+				wchar_t* modeDescr = Clist_GetStatusModeDescription(CallProtoService(accs[i]->szModuleName, PS_GETSTATUS, 0, 0), 0);

 				GetTextExtentPoint32(hdc, modeDescr, (int)mir_wstrlen(modeDescr), &textSize);

 				x += textSize.cx + GetSystemMetrics(SM_CXBORDER) * 4; // The SB panel doesnt allocate enough room

 			}

@@ -206,7 +206,7 @@ void CluiProtocolStatusChanged(int, const char*)
 	* and uses timer based sort and redraw handling. This can improve performance

 	* when connecting multiple protocols significantly.

 	*/

-	wchar_t *szStatus = pcli->pfnGetStatusModeDescription(wStatus, 0);

+	wchar_t *szStatus = Clist_GetStatusModeDescription(wStatus, 0);

 

 	/*

 	* set the global status icon and display the global (most online) status mode on the

diff --git a/plugins/Clist_nicer/src/statusbar.cpp b/plugins/Clist_nicer/src/statusbar.cpp
index 256a914f09..16ab1a814f 100644
--- a/plugins/Clist_nicer/src/statusbar.cpp
+++ b/plugins/Clist_nicer/src/statusbar.cpp
@@ -161,7 +161,7 @@ LRESULT CALLBACK NewStatusBarWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM
 

 							wchar_t szTipText[256];

 							mir_snwprintf(szTipText, L"<b>%s</b>: %s%s",

-								PD->RealName, pcli->pfnGetStatusModeDescription(wStatus, 0), isLocked ? L"  (LOCKED)" : L"");

+								PD->RealName, Clist_GetStatusModeDescription(wStatus, 0), isLocked ? L"  (LOCKED)" : L"");

 

 							CLCINFOTIP ti = { sizeof(ti) };

 							ti.isTreeFocused = (GetFocus() == pcli->hwndContactList);

diff --git a/plugins/Clist_nicer/src/viewmodes.cpp b/plugins/Clist_nicer/src/viewmodes.cpp
index 1939f5ec24..93e3756e0d 100644
--- a/plugins/Clist_nicer/src/viewmodes.cpp
+++ b/plugins/Clist_nicer/src/viewmodes.cpp
@@ -206,7 +206,7 @@ static int FillDialog(HWND hwnd)
 	ListView_InsertColumn(hwndList, 0, &lvc);

 

 	for (int i = ID_STATUS_OFFLINE; i <= ID_STATUS_OUTTOLUNCH; i++) {

-		item.pszText = TranslateW(pcli->pfnGetStatusModeDescription(i, 0));

+		item.pszText = TranslateW(Clist_GetStatusModeDescription(i, 0));

 		item.iItem = i - ID_STATUS_OFFLINE;

 		ListView_InsertItem(hwndList, &item);

 	}

diff --git a/plugins/CmdLine/src/mimcmd_handlers.cpp b/plugins/CmdLine/src/mimcmd_handlers.cpp
index 2055973420..c343412f4e 100644
--- a/plugins/CmdLine/src/mimcmd_handlers.cpp
+++ b/plugins/CmdLine/src/mimcmd_handlers.cpp
@@ -179,7 +179,7 @@ int ParseStatusParam(const wchar_t *status)
 

 wchar_t* PrettyStatusMode(int status, wchar_t *buffer, size_t size)

 {

-	wchar_t *data = pcli->pfnGetStatusModeDescription(status, 0);

+	wchar_t *data = Clist_GetStatusModeDescription(status, 0);

 	if (data)

 		wcsncpy_s(buffer, size, data, _TRUNCATE);

 	else

diff --git a/plugins/ConnectionNotify/src/ConnectionNotify.cpp b/plugins/ConnectionNotify/src/ConnectionNotify.cpp
index a703a9f5a2..8b3e44aead 100644
--- a/plugins/ConnectionNotify/src/ConnectionNotify.cpp
+++ b/plugins/ConnectionNotify/src/ConnectionNotify.cpp
@@ -341,7 +341,7 @@ INT_PTR CALLBACK DlgProcConnectionNotifyOpts(HWND hwndDlg, UINT msg, WPARAM wPar
 			// items. 

 			lvI.mask = LVIF_TEXT;

 			for (int i = 0; i < STATUS_COUNT; i++) {

-				lvI.pszText = pcli->pfnGetStatusModeDescription(ID_STATUS_ONLINE + i, 0);

+				lvI.pszText = Clist_GetStatusModeDescription(ID_STATUS_ONLINE + i, 0);

 				lvI.iItem = i;

 				ListView_InsertItem(hwndList, &lvI);

 				ListView_SetCheckState(hwndList, i, settingStatus[i]);

diff --git a/plugins/ContactsPlus/src/utils.cpp b/plugins/ContactsPlus/src/utils.cpp
index 35608b4b86..ac3b711eec 100644
--- a/plugins/ContactsPlus/src/utils.cpp
+++ b/plugins/ContactsPlus/src/utils.cpp
@@ -120,7 +120,7 @@ void UpdateDialogTitle(HWND hwndDlg, MCONTACT hContact, wchar_t *pszTitleStart)
 			if (mir_wstrcmp(uid ? uid : contactName, oldTitle))

 				SetDlgItemText(hwndDlg, IDC_NAME, uid ? uid : contactName);

 

-			wchar_t *szStatus = pcli->pfnGetStatusModeDescription(db_get_w(hContact, szProto, "Status", ID_STATUS_OFFLINE), 0);

+			wchar_t *szStatus = Clist_GetStatusModeDescription(db_get_w(hContact, szProto, "Status", ID_STATUS_OFFLINE), 0);

 			mir_snwprintf(newtitle, L"%s %s (%s)", TranslateW(pszTitleStart), contactName, szStatus);

 		}

 	}

diff --git a/plugins/FavContacts/src/menu.cpp b/plugins/FavContacts/src/menu.cpp
index ea2702ecd9..8ccf417fa5 100644
--- a/plugins/FavContacts/src/menu.cpp
+++ b/plugins/FavContacts/src/menu.cpp
@@ -75,7 +75,7 @@ static BOOL sttMeasureItem_Contact(LPMEASUREITEMSTRUCT lpmis, Options *options)
 		if (title == nullptr) {

 			char *proto = GetContactProto(hContact);

 			int status = db_get_w(hContact, proto, "Status", ID_STATUS_OFFLINE);

-			title = pcli->pfnGetStatusModeDescription(status, 0);

+			title = Clist_GetStatusModeDescription(status, 0);

 		}

 		else bFree = true;

 

@@ -318,7 +318,7 @@ static BOOL sttDrawItem_Contact(LPDRAWITEMSTRUCT lpdis, Options *options = nullp
 		wchar_t *title = db_get_wsa(hContact, "CList", "StatusMsg");

 		if (title == nullptr) {

 			int status = db_get_w(hContact, proto, "Status", ID_STATUS_OFFLINE);

-			title = pcli->pfnGetStatusModeDescription(status, 0);

+			title = Clist_GetStatusModeDescription(status, 0);

 		}

 		else bFree = true;

 

diff --git a/plugins/LotusNotify/src/LotusNotify.cpp b/plugins/LotusNotify/src/LotusNotify.cpp
index 344bf56f18..b9c5335b1c 100644
--- a/plugins/LotusNotify/src/LotusNotify.cpp
+++ b/plugins/LotusNotify/src/LotusNotify.cpp
@@ -1350,7 +1350,7 @@ static INT_PTR CALLBACK DlgProcLotusNotifyMiscOpts(HWND hwndDlg, UINT msg, WPARA
 		// Initialize LVITEM members that are common to all items.

 		lvI.mask = LVIF_TEXT;

 		for (int i = 0; i < STATUS_COUNT; i++) {

-			lvI.pszText = pcli->pfnGetStatusModeDescription(ID_STATUS_ONLINE + i, 0);

+			lvI.pszText = Clist_GetStatusModeDescription(ID_STATUS_ONLINE + i, 0);

 			lvI.iItem = i;

 			ListView_InsertItem(hwndList, &lvI);

 			ListView_SetCheckState(hwndList, i, settingStatus[i]);

diff --git a/plugins/MirandaG15/src/CAppletManager.cpp b/plugins/MirandaG15/src/CAppletManager.cpp
index 2f3375b481..fb5a268077 100644
--- a/plugins/MirandaG15/src/CAppletManager.cpp
+++ b/plugins/MirandaG15/src/CAppletManager.cpp
@@ -1431,7 +1431,7 @@ int CAppletManager::HookStatusChanged(WPARAM wParam, LPARAM lParam)
 	tstring strName = CAppletManager::GetContactDisplayname(Event.hContact, true);
 
 	// Get status String
-	Event.strValue = toTstring(pcli->pfnGetStatusModeDescription(iStatus, 0));
+	Event.strValue = toTstring(Clist_GetStatusModeDescription(iStatus, 0));
 
 	// check if this is an irc protocol
 	CIRCConnection *pIRCCon = CAppletManager::GetInstance()->GetIRCConnection(strProto);
@@ -1577,7 +1577,7 @@ int CAppletManager::HookProtoAck(WPARAM, LPARAM lParam)
 		Event.strValue = strProto;
 
 		// set the event description / summary
-		tstring strStatus = toTstring(pcli->pfnGetStatusModeDescription(iNewStatus, 0));
+		tstring strStatus = toTstring(Clist_GetStatusModeDescription(iNewStatus, 0));
 		Event.strDescription = L"(" + Event.strValue + L") " + TranslateString(L"You are now %s", strStatus.c_str());
 		Event.strSummary = TranslateString(L"Protocol status change");
 
diff --git a/plugins/MirandaG15/src/CChatScreen.cpp b/plugins/MirandaG15/src/CChatScreen.cpp
index 132b5ad2f2..8fb8c7af79 100644
--- a/plugins/MirandaG15/src/CChatScreen.cpp
+++ b/plugins/MirandaG15/src/CChatScreen.cpp
@@ -178,7 +178,7 @@ void CChatScreen::UpdateLabels()
 		m_iStatus = db_get_w(m_hContact,szProto,"Status",ID_STATUS_OFFLINE);

 	}

 	

-	wchar_t *szStatus = pcli->pfnGetStatusModeDescription(m_iStatus, 0);

+	wchar_t *szStatus = Clist_GetStatusModeDescription(m_iStatus, 0);

 	if(szStatus != nullptr)

 		strStatus = toTstring(szStatus);

 

diff --git a/plugins/MirandaG15/src/CContactList.cpp b/plugins/MirandaG15/src/CContactList.cpp
index e4000552a9..43126f5f0e 100644
--- a/plugins/MirandaG15/src/CContactList.cpp
+++ b/plugins/MirandaG15/src/CContactList.cpp
@@ -108,7 +108,7 @@ void CContactList::AddContact(MCONTACT hContact)
 		return;

 

 	int iStatus = db_get_w(hContact, szProto, "Status", ID_STATUS_OFFLINE);

-	wchar_t *szStatus = pcli->pfnGetStatusModeDescription(iStatus, 0);

+	wchar_t *szStatus = Clist_GetStatusModeDescription(iStatus, 0);

 

 	CContactListEntry *psContact = new CContactListEntry();

 

@@ -690,7 +690,7 @@ void CContactList::OnStatusChange(MCONTACT hContact, int iStatus)
 	int iOldStatus = pItemData->iStatus;

 

 	// Update the list entry

-	wchar_t *szStatus = pcli->pfnGetStatusModeDescription(iStatus, 0);

+	wchar_t *szStatus = Clist_GetStatusModeDescription(iStatus, 0);

 	if (szStatus != nullptr)

 		pItemData->strStatus = toTstring(szStatus);

 

diff --git a/plugins/MyDetails/src/data.cpp b/plugins/MyDetails/src/data.cpp
index 5f28e074e0..a536eaea5d 100644
--- a/plugins/MyDetails/src/data.cpp
+++ b/plugins/MyDetails/src/data.cpp
@@ -122,7 +122,7 @@ int Protocol::GetStatus()
 		custom_status = 0;

 

 	if (custom_status == 0) {

-		wchar_t *tmp = pcli->pfnGetStatusModeDescription(status, 0);

+		wchar_t *tmp = Clist_GetStatusModeDescription(status, 0);

 		lcopystr(status_name, tmp, _countof(status_name));

 	}

 	else {

diff --git a/plugins/MyDetails/src/frame.cpp b/plugins/MyDetails/src/frame.cpp
index 14b878a9b5..505752efc4 100644
--- a/plugins/MyDetails/src/frame.cpp
+++ b/plugins/MyDetails/src/frame.cpp
@@ -1823,7 +1823,7 @@ LRESULT CALLBACK FrameWindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPar
 				}

 

 				// Add this to menu

-				mir_snwprintf(tmp, TranslateT("Set my status message for %s..."), pcli->pfnGetStatusModeDescription(proto->status, 0));

+				mir_snwprintf(tmp, TranslateT("Set my status message for %s..."), Clist_GetStatusModeDescription(proto->status, 0));

 

 				MENUITEMINFO mii = { 0 };

 				mii.cbSize = sizeof(mii);

@@ -1902,7 +1902,7 @@ LRESULT CALLBACK FrameWindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPar
 				InsertMenuItem(submenu, 0, TRUE, &mii);

 

 				// Add this to menu

-				mir_snwprintf(tmp, TranslateT("Set my status message for %s..."), pcli->pfnGetStatusModeDescription(proto->status, 0));

+				mir_snwprintf(tmp, TranslateT("Set my status message for %s..."), Clist_GetStatusModeDescription(proto->status, 0));

 

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

 				mii.cbSize = sizeof(mii);

diff --git a/plugins/MyDetails/src/services.cpp b/plugins/MyDetails/src/services.cpp
index 2935ffa351..807d901180 100644
--- a/plugins/MyDetails/src/services.cpp
+++ b/plugins/MyDetails/src/services.cpp
@@ -342,7 +342,7 @@ static INT_PTR CALLBACK DlgProcSetStatusMessage(HWND hwndDlg, UINT msg, WPARAM w
 				Window_SetProtoIcon_IcoLib(hwndDlg, nullptr, data->status);

 

 				wchar_t title[256];

-				mir_snwprintf(title, TranslateT("Set my status message for %s"), pcli->pfnGetStatusModeDescription(data->status, 0));

+				mir_snwprintf(title, TranslateT("Set my status message for %s"), Clist_GetStatusModeDescription(data->status, 0));

 				SetWindowText(hwndDlg, title);

 

 				SetDlgItemText(hwndDlg, IDC_STATUSMESSAGE, protocols->GetDefaultStatusMsg(data->status));

diff --git a/plugins/NewAwaySysMod/src/AwayOpt.cpp b/plugins/NewAwaySysMod/src/AwayOpt.cpp
index 51e171a07b..918589f4c1 100644
--- a/plugins/NewAwaySysMod/src/AwayOpt.cpp
+++ b/plugins/NewAwaySysMod/src/AwayOpt.cpp
@@ -143,7 +143,7 @@ static INT_PTR CALLBACK MessagesOptDlg(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 		// now default status message buttons

 		for (int i = 0; i < _countof(Dlg1DefMsgDlgItems); i++) {

 			HWND hButton = GetDlgItem(hwndDlg, Dlg1DefMsgDlgItems[i].DlgItem);

-			SendMessage(hButton, BUTTONADDTOOLTIP, (WPARAM)pcli->pfnGetStatusModeDescription(Dlg1DefMsgDlgItems[i].Status, 0), BATF_UNICODE);

+			SendMessage(hButton, BUTTONADDTOOLTIP, (WPARAM)Clist_GetStatusModeDescription(Dlg1DefMsgDlgItems[i].Status, 0), BATF_UNICODE);

 			SendMessage(hButton, BUTTONSETASPUSHBTN, TRUE, 0);

 			SendMessage(hButton, BUTTONSETASFLATBTN, TRUE, 0);

 			g_OrigDefStatusButtonMsgProc = (WNDPROC)SetWindowLongPtr(hButton, GWLP_WNDPROC, (LONG_PTR)DefStatusButtonSubclassProc);

@@ -372,7 +372,7 @@ static INT_PTR CALLBACK MoreOptDlg(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM
 		SendDlgItemMessage(hwndDlg, IDC_MOREOPTDLG_UPDATEMSGSPERIOD_SPIN, UDM_SETRANGE32, 30, 99999);

 		for (int i = 0; i < _countof(Dlg2StatusButtons); i++) {

 			HWND hButton = GetDlgItem(hwndDlg, Dlg2StatusButtons[i].DlgItem);

-			SendMessage(hButton, BUTTONADDTOOLTIP, (WPARAM)pcli->pfnGetStatusModeDescription(Dlg2StatusButtons[i].Status, 0), BATF_UNICODE);

+			SendMessage(hButton, BUTTONADDTOOLTIP, (WPARAM)Clist_GetStatusModeDescription(Dlg2StatusButtons[i].Status, 0), BATF_UNICODE);

 			SendMessage(hButton, BUTTONSETASPUSHBTN, TRUE, 0);

 			SendMessage(hButton, BUTTONSETASFLATBTN, TRUE, 0);

 		}

@@ -525,7 +525,7 @@ INT_PTR CALLBACK AutoreplyOptDlg(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l
 

 			for (int i = 0; i < _countof(Dlg3StatusButtons); i++) {

 				HWND hButton = GetDlgItem(hwndDlg, Dlg3StatusButtons[i].DlgItem);

-				SendMessage(hButton, BUTTONADDTOOLTIP, (WPARAM)pcli->pfnGetStatusModeDescription(Dlg3StatusButtons[i].Status, 0), BATF_UNICODE);

+				SendMessage(hButton, BUTTONADDTOOLTIP, (WPARAM)Clist_GetStatusModeDescription(Dlg3StatusButtons[i].Status, 0), BATF_UNICODE);

 				SendMessage(hButton, BUTTONSETASPUSHBTN, TRUE, 0);

 				SendMessage(hButton, BUTTONSETASFLATBTN, TRUE, 0);

 			}

diff --git a/plugins/NewAwaySysMod/src/AwaySys.cpp b/plugins/NewAwaySysMod/src/AwaySys.cpp
index f691316049..c7b3d346b8 100644
--- a/plugins/NewAwaySysMod/src/AwaySys.cpp
+++ b/plugins/NewAwaySysMod/src/AwaySys.cpp
@@ -319,11 +319,11 @@ int PreBuildContactMenu(WPARAM hContact, LPARAM)
 		// the protocol supports status message sending for current status, or autoreplying

 		if ((Flag1 & PF1_MODEMSGSEND && CallProtoService(szProto, PS_GETCAPS, PFLAGNUM_3, 0) & Proto_Status2Flag(iMode)) || 

 			((Flag1 & PF1_IM) == PF1_IM && (i < 0 || !g_AutoreplyOptPage.GetDBValueCopy(StatusModeList[i].DisableReplyCtlID))))

-			mir_snwprintf(szSetStr, TranslateT("Set %s message for the contact"), pcli->pfnGetStatusModeDescription(iMode, 0), pcli->pfnGetContactDisplayName(hContact, 0));

+			mir_snwprintf(szSetStr, TranslateT("Set %s message for the contact"), Clist_GetStatusModeDescription(iMode, 0), pcli->pfnGetContactDisplayName(hContact, 0));

 

 		// the protocol supports status message reading for contact's status

 		if (Flag1 & PF1_MODEMSGRECV && CallProtoService(szProto, PS_GETCAPS, PFLAGNUM_3, 0) & Proto_Status2Flag(iContactMode)) {

-			mir_snwprintf(szReadStr, TranslateT("Re&ad %s message"), pcli->pfnGetStatusModeDescription(iContactMode, 0));

+			mir_snwprintf(szReadStr, TranslateT("Re&ad %s message"), Clist_GetStatusModeDescription(iContactMode, 0));

 			hReadMsgIcon = Skin_LoadProtoIcon(szProto, iContactMode);

 		}

 	}

@@ -491,7 +491,7 @@ INT_PTR srvVariablesHandler(WPARAM, LPARAM lParam)
 		Result.ReleaseBuffer();

 	}

 	else if (!mir_wstrcmp(ai->targv[0], VAR_STATDESC)) {

-		Result = (VarParseData.Flags & VPF_XSTATUS) ? STR_XSTATUSDESC : pcli->pfnGetStatusModeDescription(g_ProtoStates[VarParseData.szProto].m_status, 0);

+		Result = (VarParseData.Flags & VPF_XSTATUS) ? STR_XSTATUSDESC : Clist_GetStatusModeDescription(g_ProtoStates[VarParseData.szProto].m_status, 0);

 	}

 	else if (!mir_wstrcmp(ai->targv[0], VAR_MYNICK)) {

 		if (g_MoreOptPage.GetDBValueCopy(IDC_MOREOPTDLG_MYNICKPERPROTO) && VarParseData.szProto)

diff --git a/plugins/NewAwaySysMod/src/Client.cpp b/plugins/NewAwaySysMod/src/Client.cpp
index ec121bf903..814823e178 100644
--- a/plugins/NewAwaySysMod/src/Client.cpp
+++ b/plugins/NewAwaySysMod/src/Client.cpp
@@ -140,7 +140,7 @@ int GetRecentGroupID(int iMode)
 		return g_Messages_RecentRootID;

 

 	for (int Order = 0; Order < TreeCtrl->m_value.GetSize(); Order++) // find a group named accordingly to the current status

-		if (TreeCtrl->m_value[Order].ParentID == g_Messages_RecentRootID && TreeCtrl->m_value[Order].Flags & TIF_GROUP && !mir_wstrcmpi(TreeCtrl->m_value[Order].Title, iMode ? pcli->pfnGetStatusModeDescription(iMode, 0) : MSGTREE_RECENT_OTHERGROUP))

+		if (TreeCtrl->m_value[Order].ParentID == g_Messages_RecentRootID && TreeCtrl->m_value[Order].Flags & TIF_GROUP && !mir_wstrcmpi(TreeCtrl->m_value[Order].Title, iMode ? Clist_GetStatusModeDescription(iMode, 0) : MSGTREE_RECENT_OTHERGROUP))

 			return TreeCtrl->m_value[Order].ID;

 

 	return -1;

diff --git a/plugins/NewAwaySysMod/src/Properties.cpp b/plugins/NewAwaySysMod/src/Properties.cpp
index c68b1bfd17..16bc7a3fbb 100644
--- a/plugins/NewAwaySysMod/src/Properties.cpp
+++ b/plugins/NewAwaySysMod/src/Properties.cpp
@@ -179,7 +179,7 @@ void CProtoSettings::SetMsgFormat(int Flags, TCString Message)
 		TreeCtrl->DBToMem(CString(MOD_NAME));

 		int RecentGroupID = GetRecentGroupID(Status);

 		if (RecentGroupID == -1) { // we didn't find the group, it also means that we're using per status messages; so we need to create it

-			TreeCtrl->m_value.AddElem(CTreeItem(Status ? pcli->pfnGetStatusModeDescription(Status, 0) : MSGTREE_RECENT_OTHERGROUP, g_Messages_RecentRootID, RecentGroupID = TreeCtrl->GenerateID(), TIF_GROUP));

+			TreeCtrl->m_value.AddElem(CTreeItem(Status ? Clist_GetStatusModeDescription(Status, 0) : MSGTREE_RECENT_OTHERGROUP, g_Messages_RecentRootID, RecentGroupID = TreeCtrl->GenerateID(), TIF_GROUP));

 			TreeCtrl->SetModified(true);

 		}

 		int i;

diff --git a/plugins/NewAwaySysMod/src/ReadAwayMsg.cpp b/plugins/NewAwaySysMod/src/ReadAwayMsg.cpp
index dbe67a24b5..79e477625a 100644
--- a/plugins/NewAwaySysMod/src/ReadAwayMsg.cpp
+++ b/plugins/NewAwaySysMod/src/ReadAwayMsg.cpp
@@ -65,7 +65,7 @@ static INT_PTR CALLBACK ReadAwayMsgDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam
 			wchar_t str[256], format[128];

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

 			char *szProto = GetContactProto(awayData->hContact);

-			wchar_t *status = pcli->pfnGetStatusModeDescription(db_get_w(awayData->hContact, szProto, "Status", ID_STATUS_OFFLINE), 0);

+			wchar_t *status = Clist_GetStatusModeDescription(db_get_w(awayData->hContact, szProto, "Status", ID_STATUS_OFFLINE), 0);

 			GetWindowText(hwndDlg, format, _countof(format));

 			mir_snwprintf(str, format, status, contactName);

 			SetWindowText(hwndDlg, str);

diff --git a/plugins/NewAwaySysMod/src/SetAwayMsg.cpp b/plugins/NewAwaySysMod/src/SetAwayMsg.cpp
index 27d11321be..62c7243fdb 100644
--- a/plugins/NewAwaySysMod/src/SetAwayMsg.cpp
+++ b/plugins/NewAwaySysMod/src/SetAwayMsg.cpp
@@ -755,7 +755,7 @@ INT_PTR CALLBACK SetAwayMsgDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARA
 					SetDlgItemText(hwndDlg, IDC_OK, BtnTitle);

 					TCString WindowTitle(TranslateT("Set message for"));

 					WindowTitle += L" \"";

-					WindowTitle += Status ? pcli->pfnGetStatusModeDescription(Status, 0) : TranslateT("Statuses");

+					WindowTitle += Status ? Clist_GetStatusModeDescription(Status, 0) : TranslateT("Statuses");

 					if (nNewContacts == 1) {

 						WindowTitle += TCString(TranslateT("\" ("));

 						MCONTACT hContact = NULL;

diff --git a/plugins/Ping/src/options.cpp b/plugins/Ping/src/options.cpp
index f818782ec7..3909b2ce6c 100644
--- a/plugins/Ping/src/options.cpp
+++ b/plugins/Ping/src/options.cpp
@@ -169,7 +169,7 @@ INT_PTR CALLBACK DlgProcDestEdit(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM)
 	case WM_INITDIALOG:

 		TranslateDialogDefault(hwndDlg);

 		for (int i = ID_STATUS_OFFLINE; i <= ID_STATUS_OUTTOLUNCH; i++) {

-			wchar_t *ret = pcli->pfnGetStatusModeDescription(i, 0);

+			wchar_t *ret = Clist_GetStatusModeDescription(i, 0);

 			SendDlgItemMessage(hwndDlg, IDC_COMBO_DESTSTAT, CB_INSERTSTRING, (WPARAM)-1, (LPARAM)ret);

 			SendDlgItemMessage(hwndDlg, IDC_COMBO_DESTSTAT2, CB_INSERTSTRING, (WPARAM)-1, (LPARAM)ret);

 		}

diff --git a/plugins/Scriver/src/msgdialog.cpp b/plugins/Scriver/src/msgdialog.cpp
index b85b0f413e..a2562174cb 100644
--- a/plugins/Scriver/src/msgdialog.cpp
+++ b/plugins/Scriver/src/msgdialog.cpp
@@ -791,7 +791,7 @@ void CSrmmWindow::UpdateTitle()
 

 	if (m_hContact && m_szProto) {

 		wszTitle.Replace(L"%name%", pcli->pfnGetContactDisplayName(m_hContact, 0));

-		wszTitle.Replace(L"%status%", pcli->pfnGetStatusModeDescription(db_get_w(m_hContact, m_szProto, "Status", ID_STATUS_OFFLINE), 0));

+		wszTitle.Replace(L"%status%", Clist_GetStatusModeDescription(db_get_w(m_hContact, m_szProto, "Status", ID_STATUS_OFFLINE), 0));

 

 		CMStringW tszStatus = ptrW(db_get_wsa(m_hContact, "CList", "StatusMsg"));

 		tszStatus.Replace(L"\r\n", L" ");

diff --git a/plugins/SeenPlugin/src/utils.cpp b/plugins/SeenPlugin/src/utils.cpp
index 22af9a35b4..d93f241b4d 100644
--- a/plugins/SeenPlugin/src/utils.cpp
+++ b/plugins/SeenPlugin/src/utils.cpp
@@ -289,7 +289,7 @@ wchar_t* ParseString(wchar_t *szstring, MCONTACT hcontact)
 

 		case 's':

 			if (isetting = db_get_w(hcontact, S_MOD, hcontact ? "StatusTriger" : courProtoName, 0)) {

-				wcsncpy(szdbsetting, pcli->pfnGetStatusModeDescription(isetting | 0x8000, 0), _countof(szdbsetting));

+				wcsncpy(szdbsetting, Clist_GetStatusModeDescription(isetting | 0x8000, 0), _countof(szdbsetting));

 				if (!(isetting & 0x8000)) {

 					mir_wstrncat(szdbsetting, L"/", _countof(szdbsetting) - mir_wstrlen(szdbsetting));

 					mir_wstrncat(szdbsetting, TranslateT("Idle"), _countof(szdbsetting) - mir_wstrlen(szdbsetting));

@@ -309,7 +309,7 @@ wchar_t* ParseString(wchar_t *szstring, MCONTACT hcontact)
 

 		case 'o':

 			if (isetting = db_get_w(hcontact, S_MOD, hcontact ? "OldStatus" : courProtoName, 0)) {

-				wcsncpy(szdbsetting, pcli->pfnGetStatusModeDescription(isetting, 0), _countof(szdbsetting));

+				wcsncpy(szdbsetting, Clist_GetStatusModeDescription(isetting, 0), _countof(szdbsetting));

 				if (includeIdle && hcontact && db_get_b(hcontact, S_MOD, "OldIdle", 0)) {

 					mir_wstrncat(szdbsetting, L"/", _countof(szdbsetting) - mir_wstrlen(szdbsetting));

 					mir_wstrncat(szdbsetting, TranslateT("Idle"), _countof(szdbsetting) - mir_wstrlen(szdbsetting));

diff --git a/plugins/SimpleAR/src/Options.cpp b/plugins/SimpleAR/src/Options.cpp
index c541651d96..7647b89dd5 100644
--- a/plugins/SimpleAR/src/Options.cpp
+++ b/plugins/SimpleAR/src/Options.cpp
@@ -22,7 +22,7 @@ INT_PTR CALLBACK DlgProcOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPara
 

 			for (INT c = ID_STATUS_ONLINE; c < ID_STATUS_IDLE; c++) {

 				mir_snprintf(tszStatus, "%d", c);

-				wchar_t *pszStatus = pcli->pfnGetStatusModeDescription(c, 0);

+				wchar_t *pszStatus = Clist_GetStatusModeDescription(c, 0);

 				if (c == ID_STATUS_ONLINE || c == ID_STATUS_FREECHAT || c == ID_STATUS_INVISIBLE)

 					continue;

 				else {

diff --git a/plugins/SimpleStatusMsg/src/awaymsg.cpp b/plugins/SimpleStatusMsg/src/awaymsg.cpp
index 0f6a8cded1..fa69450ce4 100644
--- a/plugins/SimpleStatusMsg/src/awaymsg.cpp
+++ b/plugins/SimpleStatusMsg/src/awaymsg.cpp
@@ -83,7 +83,7 @@ static INT_PTR CALLBACK ReadAwayMsgDlgProc(HWND hwndDlg, UINT message, WPARAM wP
 			wchar_t *contactName = (wchar_t *)pcli->pfnGetContactDisplayName(dat->hContact, 0);

 			char *szProto = GetContactProto(dat->hContact);

 			WORD dwStatus = db_get_w(dat->hContact, szProto, "Status", ID_STATUS_OFFLINE);

-			wchar_t *status = pcli->pfnGetStatusModeDescription(dwStatus, 0);

+			wchar_t *status = Clist_GetStatusModeDescription(dwStatus, 0);

 

 			GetWindowText(hwndDlg, format, _countof(format));

 			mir_snwprintf(str, format, status, contactName);

@@ -344,17 +344,17 @@ static int AwayMsgPreBuildMenu(WPARAM hContact, LPARAM)
 	if (CallProtoService(szProto, PS_GETCAPS, PFLAGNUM_1, 0) & PF1_MODEMSGRECV) {

 		if (CallProtoService(szProto, PS_GETCAPS, PFLAGNUM_3, 0) & Proto_Status2Flag(iStatus == ID_STATUS_OFFLINE ? ID_STATUS_INVISIBLE : iStatus)) {

 			HICON hIcon = Skin_LoadProtoIcon(szProto, iStatus);

-			mir_snwprintf(str, TranslateT("Re&ad %s message"), pcli->pfnGetStatusModeDescription(iStatus, 0));

+			mir_snwprintf(str, TranslateT("Re&ad %s message"), Clist_GetStatusModeDescription(iStatus, 0));

 			Menu_ModifyItem(hAwayMsgMenuItem, str, hIcon, 0);

 			IcoLib_ReleaseIcon(hIcon);

 

 			ptrA szMsg(db_get_sa(hContact, "CList", "StatusMsg"));

 			if (szMsg != NULL) {

-				mir_snwprintf(str, TranslateT("Copy %s message"), pcli->pfnGetStatusModeDescription(iStatus, 0));

+				mir_snwprintf(str, TranslateT("Copy %s message"), Clist_GetStatusModeDescription(iStatus, 0));

 				Menu_ModifyItem(hCopyMsgMenuItem, str);

 

 				if (StrFindURL(szMsg) != nullptr) {

-					mir_snwprintf(str, TranslateT("&Go to URL in %s message"), pcli->pfnGetStatusModeDescription(iStatus, 0));

+					mir_snwprintf(str, TranslateT("&Go to URL in %s message"), Clist_GetStatusModeDescription(iStatus, 0));

 					Menu_ModifyItem(hGoToURLMenuItem, str);

 				}

 			}

diff --git a/plugins/SimpleStatusMsg/src/msgbox.cpp b/plugins/SimpleStatusMsg/src/msgbox.cpp
index cab220a553..77c4c7d66f 100644
--- a/plugins/SimpleStatusMsg/src/msgbox.cpp
+++ b/plugins/SimpleStatusMsg/src/msgbox.cpp
@@ -148,7 +148,7 @@ HWND WINAPI CreateStatusComboBoxEx(HWND hwndDlg, struct MsgBoxData *data)
 
 	for (int i = 0; i < 10; ++i) {
 		if ((Proto_Status2Flag(ID_STATUS_OFFLINE + i) & data->m_iStatusModes) || i == 0) {
-			status_desc = pcli->pfnGetStatusModeDescription(ID_STATUS_OFFLINE + i, 0);
+			status_desc = Clist_GetStatusModeDescription(ID_STATUS_OFFLINE + i, 0);
 			cbei.iItem = j;
 			cbei.pszText = (LPTSTR)status_desc;
 			if (data->m_iDlgFlags & DLG_SHOW_STATUS_ICONS) {
@@ -797,7 +797,7 @@ void ChangeDlgStatus(HWND hwndDlg, struct MsgBoxData *msgbox_data, int iStatus)
 		mir_snwprintf(szTitle, TranslateT("%s message (%s)"), buff, szProtoName);
 	}
 	else
-		mir_snwprintf(szTitle, TranslateT("%s message (%s)"), pcli->pfnGetStatusModeDescription(iStatus, 0), szProtoName);
+		mir_snwprintf(szTitle, TranslateT("%s message (%s)"), Clist_GetStatusModeDescription(iStatus, 0), szProtoName);
 	SetWindowText(hwndDlg, szTitle);
 
 	if (iStatus == ID_STATUS_CURRENT)
@@ -914,7 +914,7 @@ INT_PTR CALLBACK AwayMsgBoxDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARA
 					mir_snwprintf(szTitle, szFormat, TranslateT("<current>"), szProtoName);
 			}
 			else
-				mir_snwprintf(szTitle, szFormat, pcli->pfnGetStatusModeDescription(init_data->m_iStatus, 0), szProtoName);
+				mir_snwprintf(szTitle, szFormat, Clist_GetStatusModeDescription(init_data->m_iStatus, 0), szProtoName);
 			SetWindowText(hwndDlg, szTitle);
 
 			int icoStatus = ID_STATUS_OFFLINE;
diff --git a/plugins/SimpleStatusMsg/src/options.cpp b/plugins/SimpleStatusMsg/src/options.cpp
index ff40aa54f8..7ccffc1750 100644
--- a/plugins/SimpleStatusMsg/src/options.cpp
+++ b/plugins/SimpleStatusMsg/src/options.cpp
@@ -128,7 +128,7 @@ INT_PTR CALLBACK DlgOptionsProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM l
 			{

 				if (accounts->statusMsgFlags & Proto_Status2Flag(i))

 				{

-					index = SendDlgItemMessage(hwndDlg, IDC_CBOPTSTATUS, CB_INSERTSTRING, -1, (LPARAM)pcli->pfnGetStatusModeDescription(i, 0));

+					index = SendDlgItemMessage(hwndDlg, IDC_CBOPTSTATUS, CB_INSERTSTRING, -1, (LPARAM)Clist_GetStatusModeDescription(i, 0));

 					if (index != CB_ERR && index != CB_ERRSPACE)

 					{

 						int j;

@@ -394,7 +394,7 @@ INT_PTR CALLBACK DlgOptionsProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM l
 						int	 index;

 						if (status_modes & Proto_Status2Flag(l))

 						{

-							index = SendDlgItemMessage(hwndDlg, IDC_CBOPTSTATUS, CB_INSERTSTRING, -1, (LPARAM)pcli->pfnGetStatusModeDescription(l, 0));

+							index = SendDlgItemMessage(hwndDlg, IDC_CBOPTSTATUS, CB_INSERTSTRING, -1, (LPARAM)Clist_GetStatusModeDescription(l, 0));

 							if (index != CB_ERR && index != CB_ERRSPACE)

 							{

 								SendDlgItemMessage(hwndDlg, IDC_CBOPTSTATUS, CB_SETITEMDATA, (WPARAM)index, (LPARAM)l - ID_STATUS_ONLINE);

@@ -1580,7 +1580,7 @@ static INT_PTR CALLBACK DlgStatusOptionsProc(HWND hwndDlg, UINT uMsg, WPARAM wPa
 					{

 						if (status_modes & Proto_Status2Flag(l) || l == ID_STATUS_OFFLINE)

 						{

-							int index = SendDlgItemMessage(hwndDlg, IDC_LISTSTATUS, LB_INSERTSTRING, -1, (LPARAM)pcli->pfnGetStatusModeDescription(l, 0));

+							int index = SendDlgItemMessage(hwndDlg, IDC_LISTSTATUS, LB_INSERTSTRING, -1, (LPARAM)Clist_GetStatusModeDescription(l, 0));

 							if (index != LB_ERR && index != LB_ERRSPACE)

 							{

 								SendDlgItemMessage(hwndDlg, IDC_LISTSTATUS, LB_SETITEMDATA, (WPARAM)index, (LPARAM)l - ID_STATUS_OFFLINE);

diff --git a/plugins/StatusManager/src/AdvancedAutoAway/aaa_msgoptions.cpp b/plugins/StatusManager/src/AdvancedAutoAway/aaa_msgoptions.cpp
index 3d98745d1a..2f4228af74 100644
--- a/plugins/StatusManager/src/AdvancedAutoAway/aaa_msgoptions.cpp
+++ b/plugins/StatusManager/src/AdvancedAutoAway/aaa_msgoptions.cpp
@@ -74,7 +74,7 @@ INT_PTR CALLBACK DlgProcAutoAwayMsgOpts(HWND hwndDlg, UINT msg, WPARAM wParam, L
 				if (!(protoModeMsgFlags & Proto_Status2Flag(statusModeList[i])))
 					continue;
 
-				int j = SendDlgItemMessage(hwndDlg, IDC_STATUS, CB_ADDSTRING, 0, (LPARAM)pcli->pfnGetStatusModeDescription(statusModeList[i], 0));
+				int j = SendDlgItemMessage(hwndDlg, IDC_STATUS, CB_ADDSTRING, 0, (LPARAM)Clist_GetStatusModeDescription(statusModeList[i], 0));
 				SendDlgItemMessage(hwndDlg, IDC_STATUS, CB_SETITEMDATA, j, statusModeList[i]);
 				settings = (AAMSGSETTING**)mir_realloc(settings, (count + 1) * sizeof(AAMSGSETTING*));
 				settings[count] = (AAMSGSETTING*)mir_alloc(sizeof(AAMSGSETTING));
diff --git a/plugins/StatusManager/src/AdvancedAutoAway/aaa_options.cpp b/plugins/StatusManager/src/AdvancedAutoAway/aaa_options.cpp
index 3e69ef472a..9a3d2da69f 100644
--- a/plugins/StatusManager/src/AdvancedAutoAway/aaa_options.cpp
+++ b/plugins/StatusManager/src/AdvancedAutoAway/aaa_options.cpp
@@ -181,7 +181,7 @@ static INT_PTR CALLBACK DlgProcAutoAwayRulesOpts(HWND hwndDlg, UINT msg, WPARAM
 				lvItem.iSubItem = 0;
 				for (int i = 0; i < _countof(statusModeList); i++) {
 					if ((flags & statusModePf2List[i]) || (statusModePf2List[i] == PF2_OFFLINE) || (bSettingSame)) {
-						lvItem.pszText = pcli->pfnGetStatusModeDescription(statusModeList[i], 0);
+						lvItem.pszText = Clist_GetStatusModeDescription(statusModeList[i], 0);
 						lvItem.lParam = (LPARAM)statusModePf2List[i];
 						ListView_InsertItem(hList, &lvItem);
 						ListView_SetCheckState(hList, lvItem.iItem, setting->statusFlags & statusModePf2List[i] ? TRUE : FALSE);
@@ -201,7 +201,7 @@ static INT_PTR CALLBACK DlgProcAutoAwayRulesOpts(HWND hwndDlg, UINT msg, WPARAM
 				SendDlgItemMessage(hwndDlg, IDC_LV2STATUS, CB_RESETCONTENT, 0, 0);
 				for (int i = 0; i < _countof(statusModeList); i++) {
 					if ((flags & statusModePf2List[i]) || statusModePf2List[i] == PF2_OFFLINE || bSettingSame) {
-						wchar_t *statusMode = pcli->pfnGetStatusModeDescription(statusModeList[i], 0);
+						wchar_t *statusMode = Clist_GetStatusModeDescription(statusModeList[i], 0);
 						int item = SendDlgItemMessage(hwndDlg, IDC_LV1STATUS, CB_ADDSTRING, 0, (LPARAM)statusMode);
 						SendDlgItemMessage(hwndDlg, IDC_LV1STATUS, CB_SETITEMDATA, item, (LPARAM)statusModeList[i]);
 						item = SendDlgItemMessage(hwndDlg, IDC_LV2STATUS, CB_ADDSTRING, 0, (LPARAM)statusMode);
@@ -223,7 +223,7 @@ static INT_PTR CALLBACK DlgProcAutoAwayRulesOpts(HWND hwndDlg, UINT msg, WPARAM
 				SendMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0);
 
 			setting->lv1Status = (int)SendDlgItemMessage(hwndDlg, IDC_LV1STATUS, CB_GETITEMDATA, SendDlgItemMessage(hwndDlg, IDC_LV1STATUS, CB_GETCURSEL, 0, 0), 0);
-			SetDlgItemText(hwndDlg, IDC_SETNASTR, CMStringW(FORMAT, TranslateT("minutes of %s mode"), pcli->pfnGetStatusModeDescription(setting->lv1Status, 0)));
+			SetDlgItemText(hwndDlg, IDC_SETNASTR, CMStringW(FORMAT, TranslateT("minutes of %s mode"), Clist_GetStatusModeDescription(setting->lv1Status, 0)));
 			break;
 
 		case IDC_LV2STATUS:
diff --git a/plugins/StatusManager/src/KeepStatus/keepstatus.cpp b/plugins/StatusManager/src/KeepStatus/keepstatus.cpp
index bb58b27323..95164b9d67 100644
--- a/plugins/StatusManager/src/KeepStatus/keepstatus.cpp
+++ b/plugins/StatusManager/src/KeepStatus/keepstatus.cpp
@@ -867,7 +867,7 @@ static int ProcessPopup(int reason, LPARAM lParam)
 				
 				if (mir_wstrlen(p->m_tszAccName) > 0)
 					if (db_get_b(0, KSMODULENAME, SETTING_PUSHOWEXTRA, TRUE))
-						wszText.AppendFormat(TranslateT("%s\t(will be set to %s)\r\n"), p->m_tszAccName, pcli->pfnGetStatusModeDescription(p->m_status, 0));
+						wszText.AppendFormat(TranslateT("%s\t(will be set to %s)\r\n"), p->m_tszAccName, Clist_GetStatusModeDescription(p->m_status, 0));
 			}
 
 			hIcon = Skin_LoadProtoIcon(ps[0]->m_szName, SKINICON_STATUS_OFFLINE);
diff --git a/plugins/StatusManager/src/StartupStatus/ss_options.cpp b/plugins/StatusManager/src/StartupStatus/ss_options.cpp
index 6951b14ba3..499116447e 100644
--- a/plugins/StatusManager/src/StartupStatus/ss_options.cpp
+++ b/plugins/StatusManager/src/StartupStatus/ss_options.cpp
@@ -116,7 +116,7 @@ static wchar_t* GetLinkDescription(TProtoSettings& protoSettings)
 		else if (p->m_status == ID_STATUS_CURRENT)
 			status = TranslateT("<current>");
 		else if (p->m_status >= MIN_STATUS && p->m_status <= MAX_STATUS)
-			status = pcli->pfnGetStatusModeDescription(p->m_status, 0);
+			status = Clist_GetStatusModeDescription(p->m_status, 0);
 		else
 			status = nullptr;
 		if (status == nullptr)
@@ -541,7 +541,7 @@ class CSSAdvancedOptDlg : public CDlgBase
 			lstStatus.ResetContent();
 			for (int i = 0; i < _countof(statusModeList); i++) {
 				if ((flags & statusModePf2List[i]) || (statusModeList[i] == ID_STATUS_OFFLINE)) {
-					int item = lstStatus.AddString(pcli->pfnGetStatusModeDescription(statusModeList[i], 0), statusModeList[i]);
+					int item = lstStatus.AddString(Clist_GetStatusModeDescription(statusModeList[i], 0), statusModeList[i]);
 					if (ps->m_status == statusModeList[i])
 						lstStatus.SetCurSel(item);
 				}
diff --git a/plugins/StatusManager/src/confirmdialog.cpp b/plugins/StatusManager/src/confirmdialog.cpp
index 2c7c386ff7..f0bed4fa15 100644
--- a/plugins/StatusManager/src/confirmdialog.cpp
+++ b/plugins/StatusManager/src/confirmdialog.cpp
@@ -69,7 +69,7 @@ static INT_PTR CALLBACK StatusMessageDlgProc(HWND hwndDlg, UINT msg, WPARAM wPar
 		{
 			wchar_t desc[512];
 			mir_snwprintf(desc, TranslateT("Set %s message for %s."),
-				pcli->pfnGetStatusModeDescription(GetActualStatus(protoSetting), 0), protoSetting->m_tszAccName);
+				Clist_GetStatusModeDescription(GetActualStatus(protoSetting), 0), protoSetting->m_tszAccName);
 			SetDlgItemText(hwndDlg, IDC_DESCRIPTION, desc);
 		}
 		break;
@@ -123,7 +123,7 @@ static int SetStatusList(HWND hwndDlg)
 			case ID_STATUS_CURRENT: actualStatus = CallProtoService(it->m_szName, PS_GETSTATUS, 0, 0); break;
 			default:                actualStatus = it->m_status;
 		}
-		wchar_t *status = pcli->pfnGetStatusModeDescription(actualStatus, 0);
+		wchar_t *status = Clist_GetStatusModeDescription(actualStatus, 0);
 		switch (it->m_status) {
 		case ID_STATUS_LAST:
 			mir_snwprintf(buf, L"%s (%s)", TranslateT("<last>"), status);
@@ -265,7 +265,7 @@ static INT_PTR CALLBACK ConfirmDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 					// LAST STATUS
 					if (proto->m_status == ID_STATUS_LAST) {
 						wchar_t last[80];
-						mir_snwprintf(last, L"%s (%s)", TranslateT("<last>"), pcli->pfnGetStatusModeDescription(proto->m_lastStatus, 0));
+						mir_snwprintf(last, L"%s (%s)", TranslateT("<last>"), Clist_GetStatusModeDescription(proto->m_lastStatus, 0));
 						ListView_SetItemText(GetDlgItem(hwndDlg, IDC_STARTUPLIST), lvItem.iItem, 1, last);
 						actualStatus = proto->m_lastStatus;
 					}
@@ -274,11 +274,11 @@ static INT_PTR CALLBACK ConfirmDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 					else if (proto->m_status == ID_STATUS_CURRENT) {
 						int currentStatus = CallProtoService(proto->m_szName, PS_GETSTATUS, 0, 0);
 						wchar_t current[80];
-						mir_snwprintf(current, L"%s (%s)", TranslateT("<current>"), pcli->pfnGetStatusModeDescription(currentStatus, 0));
+						mir_snwprintf(current, L"%s (%s)", TranslateT("<current>"), Clist_GetStatusModeDescription(currentStatus, 0));
 						ListView_SetItemText(GetDlgItem(hwndDlg, IDC_STARTUPLIST), lvItem.iItem, 1, current);
 						actualStatus = currentStatus;
 					}
-					else ListView_SetItemText(GetDlgItem(hwndDlg, IDC_STARTUPLIST), lvItem.iItem, 1, pcli->pfnGetStatusModeDescription(proto->m_status, 0));
+					else ListView_SetItemText(GetDlgItem(hwndDlg, IDC_STARTUPLIST), lvItem.iItem, 1, Clist_GetStatusModeDescription(proto->m_status, 0));
 
 					if ((!((CallProtoService(proto->m_szName, PS_GETCAPS, (WPARAM)PFLAGNUM_1, 0)&PF1_MODEMSGSEND)&~PF1_INDIVMODEMSG)) || (!(CallProtoService(proto->m_szName, PS_GETCAPS, (WPARAM)PFLAGNUM_3, 0)&Proto_Status2Flag(actualStatus))))
 						EnableWindow(GetDlgItem(hwndDlg, IDC_SETSTSMSG), FALSE);
@@ -340,7 +340,7 @@ static INT_PTR CALLBACK ConfirmDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 
 				// last
 				wchar_t buf[100];
-				mir_snwprintf(buf, L"%s (%s)", TranslateT("<last>"), pcli->pfnGetStatusModeDescription(proto->m_lastStatus, 0));
+				mir_snwprintf(buf, L"%s (%s)", TranslateT("<last>"), Clist_GetStatusModeDescription(proto->m_lastStatus, 0));
 				int item = SendDlgItemMessage(hwndDlg, IDC_STATUS, CB_ADDSTRING, 0, (LPARAM)buf);
 				SendDlgItemMessage(hwndDlg, IDC_STATUS, CB_SETITEMDATA, item, ID_STATUS_LAST);
 				if (proto->m_status == ID_STATUS_LAST) {
@@ -350,7 +350,7 @@ static INT_PTR CALLBACK ConfirmDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 
 				// current
 				int currentStatus = CallProtoService(proto->m_szName, PS_GETSTATUS, 0, 0);
-				mir_snwprintf(buf, L"%s (%s)", TranslateT("<current>"), pcli->pfnGetStatusModeDescription(currentStatus, 0));
+				mir_snwprintf(buf, L"%s (%s)", TranslateT("<current>"), Clist_GetStatusModeDescription(currentStatus, 0));
 				item = SendDlgItemMessage(hwndDlg, IDC_STATUS, CB_ADDSTRING, 0, (LPARAM)buf);
 				SendDlgItemMessage(hwndDlg, IDC_STATUS, CB_SETITEMDATA, item, ID_STATUS_CURRENT);
 				if (proto->m_status == ID_STATUS_CURRENT) {
@@ -360,7 +360,7 @@ static INT_PTR CALLBACK ConfirmDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 
 				for (int i = 0; i < _countof(statusModeList); i++) {
 					if (((flags & statusModePf2List[i]) || (statusModePf2List[i] == PF2_OFFLINE)) && (!((!(flags)& Proto_Status2Flag(statusModePf2List[i]))) || ((CallProtoService(proto->m_szName, PS_GETCAPS, (WPARAM)PFLAGNUM_5, 0)&Proto_Status2Flag(statusModePf2List[i]))))) {
-						wchar_t *statusMode = pcli->pfnGetStatusModeDescription(statusModeList[i], 0);
+						wchar_t *statusMode = Clist_GetStatusModeDescription(statusModeList[i], 0);
 						item = SendDlgItemMessage(hwndDlg, IDC_STATUS, CB_ADDSTRING, 0, (LPARAM)statusMode);
 						SendDlgItemMessage(hwndDlg, IDC_STATUS, CB_SETITEMDATA, item, statusModeList[i]);
 						if (statusModeList[i] == proto->m_status)
diff --git a/plugins/TabSRMM/src/chat_window.cpp b/plugins/TabSRMM/src/chat_window.cpp
index 5e282556cb..1dfc61b5bf 100644
--- a/plugins/TabSRMM/src/chat_window.cpp
+++ b/plugins/TabSRMM/src/chat_window.cpp
@@ -965,7 +965,7 @@ void CChatRoomDlg::UpdateTitle()
 	m_hTabStatusIcon = hIcon;
 
 	if (m_cache->getStatus() != m_cache->getOldStatus()) {
-		wcsncpy_s(m_wszStatus, pcli->pfnGetStatusModeDescription(m_wStatus, 0), _TRUNCATE);
+		wcsncpy_s(m_wszStatus, Clist_GetStatusModeDescription(m_wStatus, 0), _TRUNCATE);
 
 		TCITEM item = {};
 		item.mask = TCIF_TEXT;
diff --git a/plugins/TabSRMM/src/eventpopups.cpp b/plugins/TabSRMM/src/eventpopups.cpp
index 8dff9716bb..58fc404227 100644
--- a/plugins/TabSRMM/src/eventpopups.cpp
+++ b/plugins/TabSRMM/src/eventpopups.cpp
@@ -695,7 +695,7 @@ int TSAPI UpdateTrayMenu(const CTabBaseDlg *dat, WORD wStatus, const char *szPro
 		return 0;

 

 	WORD wMyStatus = (wStatus == 0) ? db_get_w(hContact, szProto, "Status", ID_STATUS_OFFLINE) : wStatus;

-	const wchar_t	*szMyStatus = (szStatus == nullptr) ? pcli->pfnGetStatusModeDescription(wMyStatus, 0) : szStatus;

+	const wchar_t	*szMyStatus = (szStatus == nullptr) ? Clist_GetStatusModeDescription(wMyStatus, 0) : szStatus;

 

 	MENUITEMINFO mii = { 0 };

 	mii.cbSize = sizeof(mii);

diff --git a/plugins/TabSRMM/src/globals.cpp b/plugins/TabSRMM/src/globals.cpp
index 11fb6aa266..7855a24064 100644
--- a/plugins/TabSRMM/src/globals.cpp
+++ b/plugins/TabSRMM/src/globals.cpp
@@ -557,8 +557,8 @@ void CGlobals::logStatusChange(WPARAM wParam, const CContactCache *c)
 	if (wStatus == wOldStatus)

 		return;

 

-	wchar_t *szOldStatus = pcli->pfnGetStatusModeDescription(wOldStatus, 0);

-	wchar_t *szNewStatus = pcli->pfnGetStatusModeDescription(wStatus, 0);

+	wchar_t *szOldStatus = Clist_GetStatusModeDescription(wOldStatus, 0);

+	wchar_t *szNewStatus = Clist_GetStatusModeDescription(wStatus, 0);

 	if (szOldStatus == nullptr || szNewStatus == nullptr)

 		return;

 

diff --git a/plugins/TabSRMM/src/msgdialog.cpp b/plugins/TabSRMM/src/msgdialog.cpp
index b7aad94078..9ad0a15ea4 100644
--- a/plugins/TabSRMM/src/msgdialog.cpp
+++ b/plugins/TabSRMM/src/msgdialog.cpp
@@ -632,7 +632,7 @@ void CSrmmWindow::OnInitDialog()
 

 	if (m_hContact && m_szProto != nullptr) {

 		m_wStatus = db_get_w(m_hContact, m_szProto, "Status", ID_STATUS_OFFLINE);

-		wcsncpy_s(m_wszStatus, pcli->pfnGetStatusModeDescription(m_szProto == nullptr ? ID_STATUS_OFFLINE : m_wStatus, 0), _TRUNCATE);

+		wcsncpy_s(m_wszStatus, Clist_GetStatusModeDescription(m_szProto == nullptr ? ID_STATUS_OFFLINE : m_wStatus, 0), _TRUNCATE);

 	}

 	else m_wStatus = ID_STATUS_OFFLINE;

 

@@ -993,7 +993,7 @@ void CSrmmWindow::UpdateTitle()
 			m_dwFlagsEx = m_idle ? m_dwFlagsEx | MWF_SHOW_ISIDLE : m_dwFlagsEx & ~MWF_SHOW_ISIDLE;

 

 			m_wStatus = m_cache->getStatus();

-			wcsncpy_s(m_wszStatus, pcli->pfnGetStatusModeDescription(m_szProto == nullptr ? ID_STATUS_OFFLINE : m_wStatus, 0), _TRUNCATE);

+			wcsncpy_s(m_wszStatus, Clist_GetStatusModeDescription(m_szProto == nullptr ? ID_STATUS_OFFLINE : m_wStatus, 0), _TRUNCATE);

 

 			wchar_t newcontactname[128]; newcontactname[0] = 0;

 			if (PluginConfig.m_bCutContactNameOnTabs)

diff --git a/plugins/TabSRMM/src/msgoptions.cpp b/plugins/TabSRMM/src/msgoptions.cpp
index e87aa97f88..3924e7968c 100644
--- a/plugins/TabSRMM/src/msgoptions.cpp
+++ b/plugins/TabSRMM/src/msgoptions.cpp
@@ -1527,7 +1527,7 @@ INT_PTR CALLBACK DlgProcSetupStatusModes(HWND hwndDlg, UINT msg, WPARAM wParam,
 		SetWindowText(hwndDlg, TranslateT("Choose status modes"));

 		{

 			for (int i = ID_STATUS_ONLINE; i <= ID_STATUS_OUTTOLUNCH; i++) {

-				SetDlgItemText(hwndDlg, i, pcli->pfnGetStatusModeDescription(i, 0));

+				SetDlgItemText(hwndDlg, i, Clist_GetStatusModeDescription(i, 0));

 				if (dwStatusMask != -1 && (dwStatusMask & (1 << (i - ID_STATUS_ONLINE))))

 					CheckDlgButton(hwndDlg, i, BST_CHECKED);

 				Utils::enableDlgControl(hwndDlg, i, dwStatusMask != -1);

diff --git a/plugins/TabSRMM/src/msgs.cpp b/plugins/TabSRMM/src/msgs.cpp
index 57a8b76483..bfa2da6059 100644
--- a/plugins/TabSRMM/src/msgs.cpp
+++ b/plugins/TabSRMM/src/msgs.cpp
@@ -590,7 +590,7 @@ HWND TSAPI CreateNewTabForContact(TContainerData *pContainer, MCONTACT hContact,
 	}

 	else wcsncpy_s(newcontactname, L"_U_", _TRUNCATE);

 

-	wchar_t *szStatus = pcli->pfnGetStatusModeDescription(szProto == nullptr ? ID_STATUS_OFFLINE : db_get_w(hContact, szProto, "Status", ID_STATUS_OFFLINE), 0);

+	wchar_t *szStatus = Clist_GetStatusModeDescription(szProto == nullptr ? ID_STATUS_OFFLINE : db_get_w(hContact, szProto, "Status", ID_STATUS_OFFLINE), 0);

 

 	if (PluginConfig.m_bStatusOnTabs)

 		mir_snwprintf(tabtitle, L"%s (%s)", newcontactname, szStatus);

diff --git a/plugins/TabSRMM/src/trayicon.cpp b/plugins/TabSRMM/src/trayicon.cpp
index 2c12278a9a..7128879516 100644
--- a/plugins/TabSRMM/src/trayicon.cpp
+++ b/plugins/TabSRMM/src/trayicon.cpp
@@ -204,7 +204,7 @@ void TSAPI AddContactToFavorites(MCONTACT hContact, const wchar_t *szNickname, c
 		wStatus = db_get_w(hContact, szProto, "Status", ID_STATUS_OFFLINE);

 

 	if (szStatus == nullptr)

-		szStatus = pcli->pfnGetStatusModeDescription(wStatus, 0);

+		szStatus = Clist_GetStatusModeDescription(wStatus, 0);

 

 	if (hIcon == nullptr)

 		hIcon = Skin_LoadProtoIcon(szProto, wStatus);

diff --git a/plugins/TipperYM/src/popwin.cpp b/plugins/TipperYM/src/popwin.cpp
index de2d28047b..c6f520c024 100644
--- a/plugins/TipperYM/src/popwin.cpp
+++ b/plugins/TipperYM/src/popwin.cpp
@@ -119,7 +119,7 @@ LRESULT CALLBACK PopupWindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lPa
 					}
 				}
 
-				wchar_t *swzText = pcli->pfnGetStatusModeDescription(wStatus, 0);
+				wchar_t *swzText = Clist_GetStatusModeDescription(wStatus, 0);
 				if (swzText)
 					AddRow(pwd, TranslateT("Status:"), swzText, nullptr, false, false, false);
 
@@ -1503,7 +1503,7 @@ LRESULT CALLBACK PopupWindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lPa
 			}
 
 			if (dwItems & TRAYTIP_STATUS) {
-				wchar_t *swzText = pcli->pfnGetStatusModeDescription(wStatus, 0);
+				wchar_t *swzText = Clist_GetStatusModeDescription(wStatus, 0);
 				if (swzText)
 					AddRow(pwd, TranslateT("Status:"), swzText, nullptr, false, false, false);
 			}
diff --git a/plugins/TipperYM/src/translations.cpp b/plugins/TipperYM/src/translations.cpp
index 086309c988..bff2e51d8b 100644
--- a/plugins/TipperYM/src/translations.cpp
+++ b/plugins/TipperYM/src/translations.cpp
@@ -141,7 +141,7 @@ wchar_t *SecondsToTimeDifference(MCONTACT hContact, const char *szModuleName, co
 wchar_t *WordToStatusDesc(MCONTACT hContact, const char *szModuleName, const char *szSettingName, wchar_t *buff, int bufflen)

 {

 	WORD wStatus = db_get_w(hContact, szModuleName, szSettingName, ID_STATUS_OFFLINE);

-	wchar_t *szStatus = pcli->pfnGetStatusModeDescription(wStatus, 0);

+	wchar_t *szStatus = Clist_GetStatusModeDescription(wStatus, 0);

 	wcsncpy_s(buff, bufflen, szStatus, _TRUNCATE);

 	return buff;

 }

diff --git a/plugins/TooltipNotify/src/TooltipNotify.cpp b/plugins/TooltipNotify/src/TooltipNotify.cpp
index 8095077b7d..e91d2194df 100644
--- a/plugins/TooltipNotify/src/TooltipNotify.cpp
+++ b/plugins/TooltipNotify/src/TooltipNotify.cpp
@@ -786,7 +786,7 @@ BOOL CTooltipNotify::ContactsDlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM)
 wchar_t* CTooltipNotify::StatusToString(int iStatus, wchar_t *szStatus, int iBufSize)

 {

 	if (iStatus >= ID_STATUS_OFFLINE && iStatus <= ID_STATUS_OUTTOLUNCH)

-		mir_wstrncpy(szStatus, pcli->pfnGetStatusModeDescription(iStatus, 0), iBufSize);

+		mir_wstrncpy(szStatus, Clist_GetStatusModeDescription(iStatus, 0), iBufSize);

 	else {

 		switch (iStatus) {

 		case ID_TTNTF_STATUS_TYPING:

diff --git a/plugins/Variables/src/contact.cpp b/plugins/Variables/src/contact.cpp
index 6a49e0b4f5..c2ab526b37 100644
--- a/plugins/Variables/src/contact.cpp
+++ b/plugins/Variables/src/contact.cpp
@@ -135,7 +135,7 @@ wchar_t* getContactInfoT(BYTE type, MCONTACT hContact)
 		return mir_a2u(protoname);

 

 	case CCNF_STATUS:

-		return mir_wstrdup(pcli->pfnGetStatusModeDescription(db_get_w(hContact, szProto, "Status", ID_STATUS_OFFLINE), 0));

+		return mir_wstrdup(Clist_GetStatusModeDescription(db_get_w(hContact, szProto, "Status", ID_STATUS_OFFLINE), 0));

 

 	case CCNF_INTERNALIP:

 	case CCNF_EXTERNALIP:

diff --git a/plugins/Variables/src/parse_miranda.cpp b/plugins/Variables/src/parse_miranda.cpp
index 43610db3fc..d272620528 100644
--- a/plugins/Variables/src/parse_miranda.cpp
+++ b/plugins/Variables/src/parse_miranda.cpp
@@ -25,7 +25,7 @@ static wchar_t* parseCodeToStatus(ARGUMENTSINFO *ai)
 		return nullptr;

 

 	unsigned int status = ttoi(ai->targv[1]);

-	wchar_t *szStatus = pcli->pfnGetStatusModeDescription(status, 0);

+	wchar_t *szStatus = Clist_GetStatusModeDescription(status, 0);

 	if (szStatus != nullptr)

 		return mir_wstrdup(szStatus);

 

@@ -303,7 +303,7 @@ static wchar_t* parseLastSeenStatus(ARGUMENTSINFO *ai)
 	if (status == 0)

 		return nullptr;

 

-	wchar_t *szStatus = pcli->pfnGetStatusModeDescription(status, 0);

+	wchar_t *szStatus = Clist_GetStatusModeDescription(status, 0);

 	if (szStatus != nullptr)

 		return mir_wstrdup(szStatus);

 

@@ -334,7 +334,7 @@ static wchar_t* parseMyStatus(ARGUMENTSINFO *ai)
 	else

 		status = CallProtoService(_T2A(ai->targv[1]), PS_GETSTATUS, 0, 0);

 

-	wchar_t *szStatus = pcli->pfnGetStatusModeDescription(status, 0);

+	wchar_t *szStatus = Clist_GetStatusModeDescription(status, 0);

 	return (szStatus != nullptr) ? mir_wstrdup(szStatus) : nullptr;

 }

 

diff --git a/plugins/WinterSpeak/src/UserInformation.cpp b/plugins/WinterSpeak/src/UserInformation.cpp
index e0934a4861..242f4d75b7 100644
--- a/plugins/WinterSpeak/src/UserInformation.cpp
+++ b/plugins/WinterSpeak/src/UserInformation.cpp
@@ -46,7 +46,7 @@ std::wstring UserInformation::statusString(MCONTACT user)
 //------------------------------------------------------------------------------

 std::wstring UserInformation::statusModeString(MCONTACT user)

 {

-	WCHAR *status = pcli->pfnGetStatusModeDescription(m_status_info[user], 0);

+	WCHAR *status = Clist_GetStatusModeDescription(m_status_info[user], 0);

 	if (nullptr == status)

 		return L"";

 

diff --git a/plugins/XSoundNotify/src/xsn_main.cpp b/plugins/XSoundNotify/src/xsn_main.cpp
index 81a2482774..e8ea9d302f 100644
--- a/plugins/XSoundNotify/src/xsn_main.cpp
+++ b/plugins/XSoundNotify/src/xsn_main.cpp
@@ -73,7 +73,7 @@ void InitSelfSounds()
 

 			wchar_t infobuf[256];

 			mir_snwprintf(infobuf, L"%s [%s]", TranslateT("Self status"), pa->tszAccountName);

-			Skin_AddSound(namebuf, infobuf, pcli->pfnGetStatusModeDescription(selfSounds[j].iStatus, 0));

+			Skin_AddSound(namebuf, infobuf, Clist_GetStatusModeDescription(selfSounds[j].iStatus, 0));

 		}

 	}

 }

diff --git a/plugins/YAPP/src/options.cpp b/plugins/YAPP/src/options.cpp
index 262f3abe7a..c0ae8295c6 100644
--- a/plugins/YAPP/src/options.cpp
+++ b/plugins/YAPP/src/options.cpp
@@ -180,7 +180,7 @@ static INT_PTR CALLBACK DlgProcOpts1(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR
 

 			int i = 0;

 			for (; i < 10; i++) {

-				lvI.pszText = pcli->pfnGetStatusModeDescription(ID_STATUS_OFFLINE + i, 0);

+				lvI.pszText = Clist_GetStatusModeDescription(ID_STATUS_OFFLINE + i, 0);

 				lvI.iItem = i;

 				ListView_InsertItem(hwndList, &lvI);

 				ListView_SetCheckState(hwndList, i, options.disable_status[i]);

diff --git a/plugins/wbOSD/src/events.cpp b/plugins/wbOSD/src/events.cpp
index 2ab9f02e91..4b5865db85 100644
--- a/plugins/wbOSD/src/events.cpp
+++ b/plugins/wbOSD/src/events.cpp
@@ -63,7 +63,7 @@ int ProtoAck(WPARAM,LPARAM lparam)
 			DWORD ann = db_get_dw( NULL, THIS_MODULE, "announce", DEFAULT_ANNOUNCE );

 			if ( ann & ( 1 << ( ack->lParam - ID_STATUS_OFFLINE ))) {

 				wchar_t buffer[512];

-				mir_snwprintf(buffer, TranslateT("%s is %s"), pcli->pfnGetContactDisplayName(ack->hContact, 0), pcli->pfnGetStatusModeDescription(ack->lParam, 0));

+				mir_snwprintf(buffer, TranslateT("%s is %s"), pcli->pfnGetContactDisplayName(ack->hContact, 0), Clist_GetStatusModeDescription(ack->lParam, 0));

 				ShowOSD(buffer, 0, db_get_dw(NULL,THIS_MODULE, "clr_status", DEFAULT_CLRSTATUS), ack->hContact);

 	}	}	}

 

@@ -121,7 +121,7 @@ int ContactStatusChanged(WPARAM wParam, LPARAM lParam)
 		return 0;

 

 	wchar_t bufferW[512];

-	mir_snwprintf(bufferW, TranslateT("%s is %s"), pcli->pfnGetContactDisplayName(wParam, 0), pcli->pfnGetStatusModeDescription(newStatus, 0));

+	mir_snwprintf(bufferW, TranslateT("%s is %s"), pcli->pfnGetContactDisplayName(wParam, 0), Clist_GetStatusModeDescription(newStatus, 0));

 	ShowOSD(bufferW, 0, db_get_dw(NULL,THIS_MODULE, "clr_status", DEFAULT_CLRSTATUS), hContact);

 	return 0;

 }

diff --git a/plugins/wbOSD/src/options.cpp b/plugins/wbOSD/src/options.cpp
index 5c77d0390f..12ad300dae 100644
--- a/plugins/wbOSD/src/options.cpp
+++ b/plugins/wbOSD/src/options.cpp
@@ -23,7 +23,7 @@ void FillCheckBoxTree(HWND hwndTree, DWORD style)
 	tvis.item.mask = TVIF_PARAM | TVIF_TEXT | TVIF_STATE;

 	for (WORD status = ID_STATUS_OFFLINE; status <= ID_STATUS_OUTTOLUNCH; status++) {

 		tvis.item.lParam = status - ID_STATUS_OFFLINE;

-		tvis.item.pszText = pcli->pfnGetStatusModeDescription(status, 0);

+		tvis.item.pszText = Clist_GetStatusModeDescription(status, 0);

 		tvis.item.stateMask = TVIS_STATEIMAGEMASK;

 		tvis.item.state = INDEXTOSTATEIMAGEMASK((style & (1 << tvis.item.lParam)) != 0 ? 2 : 1);

 		TreeView_InsertItem(hwndTree, &tvis);