CLIST_INTERFACE::pfnGetStatusModeDescription => Clist_GetStatusModeDescription

6 files changed, 10 insertions, 10 deletions

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;