From 4882bc420186a4aef19be699e3f621dec932417d Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 2 Dec 2016 23:55:15 +0300 Subject: MS_SYSTEM_* services became functions --- plugins/MirOTR/src/otr.cpp | 2 +- plugins/MirOTR/src/svcs_proto.cpp | 2 +- plugins/MirOTR/src/utils.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'plugins/MirOTR') diff --git a/plugins/MirOTR/src/otr.cpp b/plugins/MirOTR/src/otr.cpp index c521025ef2..ccc723812a 100644 --- a/plugins/MirOTR/src/otr.cpp +++ b/plugins/MirOTR/src/otr.cpp @@ -203,7 +203,7 @@ extern "C" { wchar_t buff[512]; mir_snwprintf(buff, TranslateW(LANG_SESSION_TERMINATED_BY_OTR), contact_get_nameT(hContact)); //MessageBox(0, buff, Translate("OTR Information"), MB_OK); - if (!Miranda_Terminated()) { + if (!Miranda_IsTerminated()) { ShowMessage(hContact, buff); } diff --git a/plugins/MirOTR/src/svcs_proto.cpp b/plugins/MirOTR/src/svcs_proto.cpp index 74934fbfd1..4dd0ca4f59 100644 --- a/plugins/MirOTR/src/svcs_proto.cpp +++ b/plugins/MirOTR/src/svcs_proto.cpp @@ -108,7 +108,7 @@ INT_PTR SVC_OTRRecvMessage(WPARAM wParam,LPARAM lParam) mir_free(uname); OtrlTLV *tlv = otrl_tlv_find(tlvs, OTRL_TLV_DISCONNECTED); - if (tlv && !Miranda_Terminated()) { + if (tlv && !Miranda_IsTerminated()) { /* Notify the user that the other side disconnected. */ wchar_t buff[256]; mir_snwprintf(buff, TranslateW(LANG_SESSION_TERMINATED_BY_OTR), contact_get_nameT(ccs->hContact)); diff --git a/plugins/MirOTR/src/utils.cpp b/plugins/MirOTR/src/utils.cpp index d0447831d6..12d5d553ab 100644 --- a/plugins/MirOTR/src/utils.cpp +++ b/plugins/MirOTR/src/utils.cpp @@ -111,7 +111,7 @@ wchar_t* ProtoGetNickname(const char* proto) } void ShowPopup(const wchar_t* line1, const wchar_t* line2, int timeout, const MCONTACT hContact) { - if(CallService(MS_SYSTEM_TERMINATED, 0, 0)) return; + if(Miranda_IsTerminated()) return; if ( !options.bHavePopups) { wchar_t title[256]; -- cgit v1.2.3