From f60c78abfbd5f279b30de729046b805bba8e00b0 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sat, 7 Apr 2018 20:14:21 +0300 Subject: Proto_GetStatus is used everywhere instead of PS_GETSTATUS --- src/core/stdmsg/src/msgdialog.cpp | 2 +- src/core/stdmsg/src/msgs.cpp | 4 ++-- src/core/stduserinfo/src/userinfo.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/core') diff --git a/src/core/stdmsg/src/msgdialog.cpp b/src/core/stdmsg/src/msgdialog.cpp index ed1e9e0f2f..c7547331b9 100644 --- a/src/core/stdmsg/src/msgdialog.cpp +++ b/src/core/stdmsg/src/msgdialog.cpp @@ -463,7 +463,7 @@ void CSrmmWindow::NotifyTyping(int mode) if (!m_szProto) return; - DWORD protoStatus = CallProtoService(m_szProto, PS_GETSTATUS, 0, 0); + int protoStatus = Proto_GetStatus(m_szProto); DWORD protoCaps = CallProtoService(m_szProto, PS_GETCAPS, PFLAGNUM_1, 0); DWORD typeCaps = CallProtoService(m_szProto, PS_GETCAPS, PFLAGNUM_4, 0); diff --git a/src/core/stdmsg/src/msgs.cpp b/src/core/stdmsg/src/msgs.cpp index 7c422a5d7b..c3041c0e19 100644 --- a/src/core/stdmsg/src/msgs.cpp +++ b/src/core/stdmsg/src/msgs.cpp @@ -86,7 +86,7 @@ static int MessageEventAdded(WPARAM hContact, LPARAM lParam) Skin_PlaySound("AlertMsg"); char *szProto = GetContactProto(hContact); - if (szProto && (g_dat.popupFlags & SRMMStatusToPf2(CallProtoService(szProto, PS_GETSTATUS, 0, 0)))) { + if (szProto && (g_dat.popupFlags & SRMMStatusToPf2(Proto_GetStatus(szProto)))) { GetContainer()->AddPage(hContact); return 0; } @@ -255,7 +255,7 @@ static void RestoreUnreadMessageAlerts(void) continue; char *szProto = GetContactProto(hContact); - if (szProto && (g_dat.popupFlags & SRMMStatusToPf2(CallProtoService(szProto, PS_GETSTATUS, 0, 0)))) + if (szProto && (g_dat.popupFlags & SRMMStatusToPf2(Proto_GetStatus(szProto)))) autoPopup = true; if (autoPopup && !windowAlreadyExists) diff --git a/src/core/stduserinfo/src/userinfo.cpp b/src/core/stduserinfo/src/userinfo.cpp index aab4733403..83f50d9ef1 100644 --- a/src/core/stduserinfo/src/userinfo.cpp +++ b/src/core/stduserinfo/src/userinfo.cpp @@ -405,7 +405,7 @@ static INT_PTR CALLBACK DlgProcDetails(HWND hwndDlg, UINT msg, WPARAM wParam, LP if (szProto == nullptr) EnableWindow(GetDlgItem(hwndDlg, IDC_UPDATE), FALSE); else { - if (CallProtoService(szProto, PS_GETSTATUS, 0, 0) < ID_STATUS_ONLINE) + if (Proto_GetStatus(szProto) < ID_STATUS_ONLINE) EnableWindow(GetDlgItem(hwndDlg, IDC_UPDATE), FALSE); else EnableWindow(GetDlgItem(hwndDlg, IDC_UPDATE), !IsWindowVisible(GetDlgItem(hwndDlg, IDC_UPDATING))); -- cgit v1.2.3