CLIST_INTERFACE::pfnGetStatusModeDescription => Clist_GetStatusModeDescription

5 files changed, 15 insertions, 15 deletions

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)