From f60c78abfbd5f279b30de729046b805bba8e00b0 Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Sat, 7 Apr 2018 20:14:21 +0300
Subject: Proto_GetStatus is used everywhere instead of PS_GETSTATUS

---
 plugins/NewAwaySysMod/src/AwaySys.cpp       | 2 +-
 plugins/NewAwaySysMod/src/Client.cpp        | 2 +-
 plugins/NewAwaySysMod/src/MsgEventAdded.cpp | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'plugins/NewAwaySysMod')

diff --git a/plugins/NewAwaySysMod/src/AwaySys.cpp b/plugins/NewAwaySysMod/src/AwaySys.cpp
index a88cec226b..a29cfd136d 100644
--- a/plugins/NewAwaySysMod/src/AwaySys.cpp
+++ b/plugins/NewAwaySysMod/src/AwaySys.cpp
@@ -302,7 +302,7 @@ static int IdleChangeEvent(WPARAM, LPARAM lParam)
 int PreBuildContactMenu(WPARAM hContact, LPARAM)
 {
 	char *szProto = GetContactProto(hContact);
-	int iMode = szProto ? CallProtoService(szProto, PS_GETSTATUS, 0, 0) : 0;
+	int iMode = szProto ? Proto_GetStatus(szProto) : 0;
 	int Flag1 = szProto ? CallProtoService(szProto, PS_GETCAPS, PFLAGNUM_1, 0) : 0;
 	int iContactMode = db_get_w(hContact, szProto, "Status", ID_STATUS_OFFLINE);
 	wchar_t szSetStr[256], szReadStr[256];
diff --git a/plugins/NewAwaySysMod/src/Client.cpp b/plugins/NewAwaySysMod/src/Client.cpp
index 814823e178..661385e298 100644
--- a/plugins/NewAwaySysMod/src/Client.cpp
+++ b/plugins/NewAwaySysMod/src/Client.cpp
@@ -36,7 +36,7 @@ void __cdecl UpdateMsgsThreadProc(void *)
 		DWORD MinUpdateTimeDifference = (DWORD)g_MoreOptPage.GetDBValueCopy(IDC_MOREOPTDLG_UPDATEMSGSPERIOD) * 1000; // in milliseconds
 		for (auto &p : Accounts()) {
 			if (CallProtoService(p->szModuleName, PS_GETCAPS, PFLAGNUM_1, 0) & PF1_MODEMSGSEND && !IsAnICQProto(p->szModuleName)) {
-				int Status = CallProtoService(p->szModuleName, PS_GETSTATUS, 0, 0);
+				int Status = Proto_GetStatus(p->szModuleName);
 				if (Status < ID_STATUS_OFFLINE || Status > ID_STATUS_OUTTOLUNCH) {
 					Status = g_ProtoStates[p->szModuleName].m_status;
 				}
diff --git a/plugins/NewAwaySysMod/src/MsgEventAdded.cpp b/plugins/NewAwaySysMod/src/MsgEventAdded.cpp
index 0f71f63661..266437ea13 100644
--- a/plugins/NewAwaySysMod/src/MsgEventAdded.cpp
+++ b/plugins/NewAwaySysMod/src/MsgEventAdded.cpp
@@ -165,7 +165,7 @@ int MsgEventAdded(WPARAM hContact, LPARAM lParam)
 		return 0;
 	}
 
-	int iMode = CallProtoService(szProto, PS_GETSTATUS, 0, 0);
+	int iMode = Proto_GetStatus(szProto);
 	int i;
 	for (i = _countof(StatusModeList) - 1; i >= 0; i--)
 		if (iMode == StatusModeList[i].Status)
-- 
cgit v1.2.3