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 --- plugins/Scriver/src/msgdialog.cpp | 2 +- plugins/Scriver/src/msgs.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'plugins/Scriver/src') diff --git a/plugins/Scriver/src/msgdialog.cpp b/plugins/Scriver/src/msgdialog.cpp index 9df51fc70c..020404d9ae 100644 --- a/plugins/Scriver/src/msgdialog.cpp +++ b/plugins/Scriver/src/msgdialog.cpp @@ -624,7 +624,7 @@ bool CSrmmWindow::IsTypingNotificationEnabled() if (!db_get_b(m_hContact, SRMM_MODULE, SRMSGSET_TYPING, db_get_b(0, SRMM_MODULE, SRMSGSET_TYPINGNEW, SRMSGDEFSET_TYPINGNEW))) return FALSE; - DWORD protoStatus = CallProtoService(m_szProto, PS_GETSTATUS, 0, 0); + DWORD protoStatus = Proto_GetStatus(m_szProto); if (protoStatus < ID_STATUS_ONLINE) return FALSE; diff --git a/plugins/Scriver/src/msgs.cpp b/plugins/Scriver/src/msgs.cpp index 6bf42b4f49..3d6279ab5a 100644 --- a/plugins/Scriver/src/msgs.cpp +++ b/plugins/Scriver/src/msgs.cpp @@ -66,7 +66,7 @@ int IsAutoPopup(MCONTACT hContact) { if (hContact != 0) szProto = GetContactProto(hContact); - if (szProto && (g_dat.openFlags & SRMMStatusToPf2(CallProtoService(szProto, PS_GETSTATUS, 0, 0)))) + if (szProto && (g_dat.openFlags & SRMMStatusToPf2(Proto_GetStatus(szProto)))) return 1; } return 0; -- cgit v1.2.3