summaryrefslogtreecommitdiff
path: root/protocols
diff options
context:
space:
mode:
Diffstat (limited to 'protocols')
-rwxr-xr-xprotocols/AimOscar/src/client.cpp2
-rwxr-xr-xprotocols/AimOscar/src/connection.cpp2
-rw-r--r--protocols/AimOscar/src/direct_connect.cpp2
-rw-r--r--protocols/AimOscar/src/proxy.cpp2
-rw-r--r--protocols/AimOscar/src/server.cpp2
-rwxr-xr-xprotocols/AimOscar/src/utility.cpp2
-rw-r--r--protocols/FacebookRM/src/avatars.cpp2
-rw-r--r--protocols/FacebookRM/src/main.cpp2
-rw-r--r--protocols/Gadu-Gadu/src/core.cpp2
-rw-r--r--protocols/Gadu-Gadu/src/popups.cpp2
-rw-r--r--protocols/IRCG/src/commandmonitor.cpp2
-rw-r--r--protocols/IRCG/src/input.cpp2
-rw-r--r--protocols/IRCG/src/irclib.cpp2
-rw-r--r--protocols/IRCG/src/services.cpp2
-rw-r--r--protocols/IcqOscarJ/src/fam_01service.cpp2
-rw-r--r--protocols/IcqOscarJ/src/icq_avatar.cpp2
-rw-r--r--protocols/IcqOscarJ/src/userinfotab.cpp2
-rw-r--r--protocols/IcqOscarJ/src/utilities.cpp2
-rw-r--r--protocols/JabberG/src/jabber.cpp2
-rw-r--r--protocols/MRA/src/Mra_functions.cpp2
-rw-r--r--protocols/Sametime/src/files.cpp2
-rw-r--r--protocols/Sametime/src/sametime_session.cpp2
-rw-r--r--protocols/Sametime/src/utils.cpp2
-rw-r--r--protocols/SkypeWeb/src/main.cpp2
-rw-r--r--protocols/SkypeWeb/src/skype_popups.cpp2
-rw-r--r--protocols/SkypeWeb/src/skype_proto.cpp2
-rw-r--r--protocols/Steam/src/steam_proto.cpp2
-rw-r--r--protocols/Steam/src/steam_utils.cpp2
-rw-r--r--protocols/Tlen/src/tlen_thread.cpp2
-rw-r--r--protocols/Tox/src/tox_proto.cpp2
-rw-r--r--protocols/Tox/src/tox_utils.cpp2
-rw-r--r--protocols/Twitter/src/connection.cpp2
-rw-r--r--protocols/WhatsApp/src/main.cpp2
33 files changed, 33 insertions, 33 deletions
diff --git a/protocols/AimOscar/src/client.cpp b/protocols/AimOscar/src/client.cpp
index 220d93ab51..d428154a0a 100755
--- a/protocols/AimOscar/src/client.cpp
+++ b/protocols/AimOscar/src/client.cpp
@@ -53,7 +53,7 @@ int CAimProto::aim_auth_request(HANDLE hServerConn, unsigned short &seqno, const
mir_md5_finish(&state, auth_hash);
char client_id[64], mirver[64];
- CallService(MS_SYSTEM_GETVERSIONTEXT, sizeof(mirver), (LPARAM)mirver);
+ Miranda_GetVersionText(mirver, sizeof(mirver));
int client_id_len = mir_snprintf(client_id, "Miranda AIM, version %s", mirver);
char* buf = (char*)alloca(SNAC_SIZE + TLV_HEADER_SIZE * 13 + MD5_HASH_LENGTH + mir_strlen(username) + client_id_len + 30 + mir_strlen(language) + mir_strlen(country));
diff --git a/protocols/AimOscar/src/connection.cpp b/protocols/AimOscar/src/connection.cpp
index 45f7416536..cb4fbf092f 100755
--- a/protocols/AimOscar/src/connection.cpp
+++ b/protocols/AimOscar/src/connection.cpp
@@ -391,7 +391,7 @@ void __cdecl CAimProto::aim_protocol_negotiation(void*)
{
unsigned short offset = 0;
char client_id[64], mirver[64];
- CallService(MS_SYSTEM_GETVERSIONTEXT, sizeof(mirver), (LPARAM)mirver);
+ Miranda_GetVersionText(mirver, sizeof(mirver));
int client_id_len = mir_snprintf(client_id, "Miranda AIM, version %s", mirver);
char* buf_ = (char*)alloca(SNAC_SIZE + TLV_HEADER_SIZE * 8 + COOKIE_LENGTH + client_id_len + 30); //TODO: correct length
diff --git a/protocols/AimOscar/src/direct_connect.cpp b/protocols/AimOscar/src/direct_connect.cpp
index c4d026515d..fa1f8ea22c 100644
--- a/protocols/AimOscar/src/direct_connect.cpp
+++ b/protocols/AimOscar/src/direct_connect.cpp
@@ -44,7 +44,7 @@ void __cdecl CAimProto::aim_dc_helper(void* param) //only called when we are ini
if (result == 0)
ProtoBroadcastAck(ft->hContact, ACKTYPE_FILE, ACKRESULT_SUCCESS, ft, 0);
else {
- if (!ft->requester && result == 1 && !Miranda_Terminated()) {
+ if (!ft->requester && result == 1 && !Miranda_IsTerminated()) {
ft->accepted = false;
HANDLE hConn = aim_peer_connect(AIM_PROXY_SERVER, get_default_port());
if (hConn) {
diff --git a/protocols/AimOscar/src/proxy.cpp b/protocols/AimOscar/src/proxy.cpp
index 35076518ae..10e04df718 100644
--- a/protocols/AimOscar/src/proxy.cpp
+++ b/protocols/AimOscar/src/proxy.cpp
@@ -105,7 +105,7 @@ void __cdecl CAimProto::aim_proxy_helper(void* param)
int i;
for (i = 21; --i; )
{
- if (Miranda_Terminated()) return;
+ if (Miranda_IsTerminated()) return;
Sleep(100);
if (ft->accepted) break;
}
diff --git a/protocols/AimOscar/src/server.cpp b/protocols/AimOscar/src/server.cpp
index 50bddbceb9..7b9b04854d 100644
--- a/protocols/AimOscar/src/server.cpp
+++ b/protocols/AimOscar/src/server.cpp
@@ -941,7 +941,7 @@ void CAimProto::snac_contact_list(SNAC &snac, HANDLE hServerConn, unsigned short
if (getDword(AIM_KEY_LV, 0) < 0x80500) {
upload_nicks();
- setDword(AIM_KEY_LV, (DWORD)CallService(MS_SYSTEM_GETVERSION, 0, 0));
+ setDword(AIM_KEY_LV, Miranda_GetVersion());
}
if (getByte(AIM_KEY_CM, 0))
diff --git a/protocols/AimOscar/src/utility.cpp b/protocols/AimOscar/src/utility.cpp
index 6ac3457ed4..1e9601c836 100755
--- a/protocols/AimOscar/src/utility.cpp
+++ b/protocols/AimOscar/src/utility.cpp
@@ -149,7 +149,7 @@ bool CAimProto::wait_conn(HANDLE& hConn, HANDLE& hEvent, unsigned short service)
if (WaitForSingleObjectEx(hEvent, 10000, TRUE) != WAIT_OBJECT_0)
return false;
- if (Miranda_Terminated() || m_iStatus == ID_STATUS_OFFLINE)
+ if (Miranda_IsTerminated() || m_iStatus == ID_STATUS_OFFLINE)
return false;
return true;
diff --git a/protocols/FacebookRM/src/avatars.cpp b/protocols/FacebookRM/src/avatars.cpp
index 14d8d6030b..3f4c3852d5 100644
--- a/protocols/FacebookRM/src/avatars.cpp
+++ b/protocols/FacebookRM/src/avatars.cpp
@@ -98,7 +98,7 @@ void FacebookProto::UpdateAvatarWorker(void *)
PROTO_AVATAR_INFORMATION ai = { 0 };
ai.hContact = avatar_queue[0];
- if (Miranda_Terminated())
+ if (Miranda_IsTerminated())
{
debugLogA("*** Terminating avatar update early: %s", url.c_str());
break;
diff --git a/protocols/FacebookRM/src/main.cpp b/protocols/FacebookRM/src/main.cpp
index 77c280e9af..dd4a7b11c6 100644
--- a/protocols/FacebookRM/src/main.cpp
+++ b/protocols/FacebookRM/src/main.cpp
@@ -105,7 +105,7 @@ extern "C" int __declspec(dllexport) Load(void)
// Init native User-Agent
WORD v[4];
- CallService(MS_SYSTEM_GETFILEVERSION, 0, (LPARAM)v);
+ Miranda_GetFileVersion(&v);
std::stringstream agent;
agent << "Miranda NG/" << v[0] << "." << v[1] << "." << v[2];
#ifdef _WIN64
diff --git a/protocols/Gadu-Gadu/src/core.cpp b/protocols/Gadu-Gadu/src/core.cpp
index 421cfef1a7..000edf3ed9 100644
--- a/protocols/Gadu-Gadu/src/core.cpp
+++ b/protocols/Gadu-Gadu/src/core.cpp
@@ -441,7 +441,7 @@ retry:
hConnStopEvent = CreateEvent(NULL, TRUE, FALSE, NULL);
dwResult = WaitForSingleObjectEx(hConnStopEvent, dwInterval, TRUE);
if ((dwResult == WAIT_OBJECT_0 && m_iDesiredStatus == ID_STATUS_OFFLINE)
- || (dwResult == WAIT_IO_COMPLETION && Miranda_Terminated()))
+ || (dwResult == WAIT_IO_COMPLETION && Miranda_IsTerminated()))
bRetry = FALSE;
CloseHandle(hConnStopEvent);
hConnStopEvent = NULL;
diff --git a/protocols/Gadu-Gadu/src/popups.cpp b/protocols/Gadu-Gadu/src/popups.cpp
index 0d68758a86..dcc88ee18c 100644
--- a/protocols/Gadu-Gadu/src/popups.cpp
+++ b/protocols/Gadu-Gadu/src/popups.cpp
@@ -151,7 +151,7 @@ void CALLBACK sttMainThreadCallback(PVOID dwParam)
void GGPROTO::showpopup(const wchar_t* nickname, const wchar_t* msg, int flags)
{
- if (Miranda_Terminated()) return;
+ if (Miranda_IsTerminated()) return;
PopupData *puData = (PopupData*)mir_calloc(sizeof(PopupData));
puData->flags = flags;
diff --git a/protocols/IRCG/src/commandmonitor.cpp b/protocols/IRCG/src/commandmonitor.cpp
index 26eaeebb80..6782a772a0 100644
--- a/protocols/IRCG/src/commandmonitor.cpp
+++ b/protocols/IRCG/src/commandmonitor.cpp
@@ -2252,7 +2252,7 @@ void CIrcProto::OnIrcDisconnected()
Chat_Control(m_szModuleName, NULL, SESSION_OFFLINE);
- if (!Miranda_Terminated())
+ if (!Miranda_IsTerminated())
CList_SetAllOffline(m_disconnectDCCChats);
// restore the original nick, cause it might be changed
diff --git a/protocols/IRCG/src/input.cpp b/protocols/IRCG/src/input.cpp
index ecdbe4c3ff..84df4d72a5 100644
--- a/protocols/IRCG/src/input.cpp
+++ b/protocols/IRCG/src/input.cpp
@@ -174,7 +174,7 @@ CMStringW CIrcProto::DoIdentifiers(CMStringW text, const wchar_t*)
text.Replace(L"%me", m_info.sNick.c_str());
char mirver[100];
- CallService(MS_SYSTEM_GETVERSIONTEXT, _countof(mirver), LPARAM(mirver));
+ Miranda_GetVersionText(mirver, _countof(mirver));
text.Replace(L"%mirver", _A2T(mirver));
text.Replace(L"%version", _A2T(__VERSION_STRING_DOTS));
diff --git a/protocols/IRCG/src/irclib.cpp b/protocols/IRCG/src/irclib.cpp
index d59717900a..84b5d6476e 100644
--- a/protocols/IRCG/src/irclib.cpp
+++ b/protocols/IRCG/src/irclib.cpp
@@ -218,7 +218,7 @@ bool CIrcProto::Connect(const CIrcSessionInfo& info)
}
}
- if (Miranda_Terminated()) {
+ if (Miranda_IsTerminated()) {
Disconnect();
return false;
}
diff --git a/protocols/IRCG/src/services.cpp b/protocols/IRCG/src/services.cpp
index dc0b504209..e60957ab47 100644
--- a/protocols/IRCG/src/services.cpp
+++ b/protocols/IRCG/src/services.cpp
@@ -963,7 +963,7 @@ void __cdecl CIrcProto::ConnectServerThread(void*)
InterlockedIncrement((long *)&m_bConnectThreadRunning);
InterlockedIncrement((long *)&m_bConnectRequested);
- while (!Miranda_Terminated() && m_bConnectRequested > 0) {
+ while (!Miranda_IsTerminated() && m_bConnectRequested > 0) {
while (m_bConnectRequested > 0)
InterlockedDecrement((long *)&m_bConnectRequested);
if (IsConnected()) {
diff --git a/protocols/IcqOscarJ/src/fam_01service.cpp b/protocols/IcqOscarJ/src/fam_01service.cpp
index 412dec2b39..161d9b10af 100644
--- a/protocols/IcqOscarJ/src/fam_01service.cpp
+++ b/protocols/IcqOscarJ/src/fam_01service.cpp
@@ -676,7 +676,7 @@ void CIcqProto::setUserInfo()
packDWord(&packet, 0x6E64614E);
WORD v[4];
- CallService(MS_SYSTEM_GETFILEVERSION, 0, (LPARAM)v);
+ Miranda_GetFileVersion(&v);
packWord(&packet, v[0]);
packWord(&packet, v[1]);
packWord(&packet, v[2]);
diff --git a/protocols/IcqOscarJ/src/icq_avatar.cpp b/protocols/IcqOscarJ/src/icq_avatar.cpp
index 57616ecde7..6fd71d67e0 100644
--- a/protocols/IcqOscarJ/src/icq_avatar.cpp
+++ b/protocols/IcqOscarJ/src/icq_avatar.cpp
@@ -894,7 +894,7 @@ void avatars_server_connection::connectionThread()
if (recvResult == SOCKET_ERROR) {
if (GetLastError() == ERROR_TIMEOUT) { // timeout, check if we should be still running
- if (Miranda_Terminated())
+ if (Miranda_IsTerminated())
break;
if (time(0) >= dwLastKeepAlive) { // limit frequency (HACK: on some systems select() does not work well)
diff --git a/protocols/IcqOscarJ/src/userinfotab.cpp b/protocols/IcqOscarJ/src/userinfotab.cpp
index e6be98831a..2f35f7e007 100644
--- a/protocols/IcqOscarJ/src/userinfotab.cpp
+++ b/protocols/IcqOscarJ/src/userinfotab.cpp
@@ -234,7 +234,7 @@ static INT_PTR CALLBACK IcqDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM
else {
char str[MAX_PATH];
WORD v[4];
- CallService(MS_SYSTEM_GETFILEVERSION, 0, (LPARAM)&v);
+ Miranda_GetFileVersion(&v);
mir_snprintf(str, "Miranda NG %d.%d.%d.%d (ICQ %s)", v[0], v[1], v[2], v[3], __VERSION_STRING_DOTS);
SetValue(ppro, hwndDlg, IDC_PORT, hContact, (char*)DBVT_WORD, (char*)ppro->wListenPort, SVS_ZEROISUNSPEC);
diff --git a/protocols/IcqOscarJ/src/utilities.cpp b/protocols/IcqOscarJ/src/utilities.cpp
index d15779ae08..49ef420754 100644
--- a/protocols/IcqOscarJ/src/utilities.cpp
+++ b/protocols/IcqOscarJ/src/utilities.cpp
@@ -1355,7 +1355,7 @@ DWORD ICQWaitForSingleObject(HANDLE hObject, DWORD dwMilliseconds, int bWaitAlwa
do { // will get WAIT_IO_COMPLETION for QueueUserAPC(), ignore it unless terminating
dwResult = WaitForSingleObjectEx(hObject, dwMilliseconds, TRUE);
}
- while (dwResult == WAIT_IO_COMPLETION && (bWaitAlways || !Miranda_Terminated()));
+ while (dwResult == WAIT_IO_COMPLETION && (bWaitAlways || !Miranda_IsTerminated()));
return dwResult;
}
diff --git a/protocols/JabberG/src/jabber.cpp b/protocols/JabberG/src/jabber.cpp
index 5b1ad552b1..35d92e6f17 100644
--- a/protocols/JabberG/src/jabber.cpp
+++ b/protocols/JabberG/src/jabber.cpp
@@ -193,7 +193,7 @@ extern "C" int __declspec(dllexport) Load()
}
WORD v[4];
- CallService(MS_SYSTEM_GETFILEVERSION, 0, (LPARAM)v);
+ Miranda_GetFileVersion(&v);
mir_snwprintf(szCoreVersion, L"%d.%d.%d.%d", v[0], v[1], v[2], v[3]);
CallService(MS_UTILS_GETCOUNTRYLIST, (WPARAM)&g_cbCountries, (LPARAM)&g_countries);
diff --git a/protocols/MRA/src/Mra_functions.cpp b/protocols/MRA/src/Mra_functions.cpp
index 844d654245..3b77a98b25 100644
--- a/protocols/MRA/src/Mra_functions.cpp
+++ b/protocols/MRA/src/Mra_functions.cpp
@@ -32,7 +32,7 @@ CMStringA MraGetSelfVersionString()
LPSTR lpszSecIM = ServiceExists("SecureIM/IsContactSecured") ? " + SecureIM" : "";
CMStringA szSelfVersion;
- CallService(MS_SYSTEM_GETFILEVERSION, 0, (LPARAM)v);
+ Miranda_GetFileVersion(&v);
szSelfVersion.Format("Miranda NG %lu.%lu.%lu.%lu Unicode (MRA v%lu.%lu.%lu.%lu)%s, version: %lu.%lu",
v[0], v[1], v[2], v[3], __FILEVERSION_STRING, lpszSecIM, PROTO_VERSION_MAJOR, PROTO_VERSION_MINOR);
return szSelfVersion;
diff --git a/protocols/Sametime/src/files.cpp b/protocols/Sametime/src/files.cpp
index 9f035200e4..0f30f5f06f 100644
--- a/protocols/Sametime/src/files.cpp
+++ b/protocols/Sametime/src/files.cpp
@@ -93,7 +93,7 @@ void __cdecl SendThread(LPVOID param) {
pfts.totalFiles = ftcd->first->ft_count;
pfts.totalBytes = ftcd->first->totalSize;
- while(SendFileChunk(proto, ft, ftcd) && !Miranda_Terminated()) {
+ while(SendFileChunk(proto, ft, ftcd) && !Miranda_IsTerminated()) {
pfts.currentFileNumber = ftcd->ft_number;
pfts.totalProgress = ftcd->sizeToHere + mwFileTransfer_getSent(ft);
pfts.szWorkingDir = ftcd->save_path;
diff --git a/protocols/Sametime/src/sametime_session.cpp b/protocols/Sametime/src/sametime_session.cpp
index f1f595d8a7..e492bdaa94 100644
--- a/protocols/Sametime/src/sametime_session.cpp
+++ b/protocols/Sametime/src/sametime_session.cpp
@@ -362,7 +362,7 @@ void __cdecl KeepAliveThread(LPVOID param)
SleepEx(250, TRUE);
mir_cslock lck(proto->session_cs);
- if (Miranda_Terminated() || !proto->session) {
+ if (Miranda_IsTerminated() || !proto->session) {
proto->debugLogW(L"KeepAliveThread() end");
break;
}
diff --git a/protocols/Sametime/src/utils.cpp b/protocols/Sametime/src/utils.cpp
index 321115a890..27d962a9d9 100644
--- a/protocols/Sametime/src/utils.cpp
+++ b/protocols/Sametime/src/utils.cpp
@@ -113,7 +113,7 @@ void CALLBACK sttMainThreadCallback(PVOID dwParam)
void CSametimeProto::showPopup(const wchar_t* msg, SametimePopupEnum flag)
{
- if (Miranda_Terminated()) return;
+ if (Miranda_IsTerminated()) return;
PopupData *puData = (PopupData*)mir_calloc(sizeof(PopupData));
puData->flag = flag;
diff --git a/protocols/SkypeWeb/src/main.cpp b/protocols/SkypeWeb/src/main.cpp
index 6c4965b96b..b1ebb5b7c7 100644
--- a/protocols/SkypeWeb/src/main.cpp
+++ b/protocols/SkypeWeb/src/main.cpp
@@ -60,7 +60,7 @@ extern "C" int __declspec(dllexport) Load(void)
pcli = Clist_GetInterface();
pci = Chat_GetInterface();
CallService(MS_IMG_GETINTERFACE, FI_IF_VERSION, (LPARAM)&fii);
- CallService(MS_SYSTEM_GETVERSIONTEXT, sizeof(g_szMirVer), LPARAM(g_szMirVer));
+ Miranda_GetVersionText(g_szMirVer, sizeof(g_szMirVer));
PROTOCOLDESCRIPTOR pd = { 0 };
pd.cbSize = sizeof(pd);
diff --git a/protocols/SkypeWeb/src/skype_popups.cpp b/protocols/SkypeWeb/src/skype_popups.cpp
index 810491c807..d3ffa065b3 100644
--- a/protocols/SkypeWeb/src/skype_popups.cpp
+++ b/protocols/SkypeWeb/src/skype_popups.cpp
@@ -49,7 +49,7 @@ void CSkypeProto::UninitPopups()
void CSkypeProto::ShowNotification(const wchar_t *caption, const wchar_t *message, MCONTACT hContact, int type)
{
- if (Miranda_Terminated())
+ if (Miranda_IsTerminated())
return;
if (ServiceExists(MS_POPUP_ADDPOPUPCLASS)) {
diff --git a/protocols/SkypeWeb/src/skype_proto.cpp b/protocols/SkypeWeb/src/skype_proto.cpp
index 1d5b85e89e..bed1e13ea3 100644
--- a/protocols/SkypeWeb/src/skype_proto.cpp
+++ b/protocols/SkypeWeb/src/skype_proto.cpp
@@ -266,7 +266,7 @@ int CSkypeProto::SetStatus(int iNewStatus)
CloseDialogs();
ProtoBroadcastAck(NULL, ACKTYPE_STATUS, ACKRESULT_SUCCESS, (HANDLE)old_status, ID_STATUS_OFFLINE);
- if (!Miranda_Terminated())
+ if (!Miranda_IsTerminated())
SetAllContactsStatus(ID_STATUS_OFFLINE);
return 0;
}
diff --git a/protocols/Steam/src/steam_proto.cpp b/protocols/Steam/src/steam_proto.cpp
index 264be85961..3acfe40114 100644
--- a/protocols/Steam/src/steam_proto.cpp
+++ b/protocols/Steam/src/steam_proto.cpp
@@ -315,7 +315,7 @@ int CSteamProto::SetStatus(int new_status)
requestQueue->Stop();
- if (!Miranda_Terminated())
+ if (!Miranda_IsTerminated())
SetAllContactsStatus(ID_STATUS_OFFLINE);
}
else if (old_status == ID_STATUS_OFFLINE)
diff --git a/protocols/Steam/src/steam_utils.cpp b/protocols/Steam/src/steam_utils.cpp
index 6c70528787..1f3cfdfa8e 100644
--- a/protocols/Steam/src/steam_utils.cpp
+++ b/protocols/Steam/src/steam_utils.cpp
@@ -161,7 +161,7 @@ exit:
void CSteamProto::ShowNotification(const wchar_t *caption, const wchar_t *message, int flags, MCONTACT hContact)
{
- if (Miranda_Terminated())
+ if (Miranda_IsTerminated())
return;
if (ServiceExists(MS_POPUP_ADDPOPUPT) && db_get_b(NULL, "Popup", "ModuleIsEnabled", 1))
diff --git a/protocols/Tlen/src/tlen_thread.cpp b/protocols/Tlen/src/tlen_thread.cpp
index f0cc77fd33..b6956a3095 100644
--- a/protocols/Tlen/src/tlen_thread.cpp
+++ b/protocols/Tlen/src/tlen_thread.cpp
@@ -561,7 +561,7 @@ static void TlenProcessIqGetVersion(TlenProtocol *proto, XmlNode *node)
if ( os == NULL ) os = TlenTextEncode("Windows");
mir_strcpy(mversion, "Miranda NG ");
- CallService(MS_SYSTEM_GETVERSIONTEXT, sizeof( mversion ) - 11, ( LPARAM )mversion + 11 );
+ Miranda_GetVersionText(mversion + 11, sizeof(mversion) - 11);
mir_strcat(mversion, " (Tlen v.");
mir_strcat(mversion, TLEN_VERSION_STRING);
mir_strcat(mversion, ")");
diff --git a/protocols/Tox/src/tox_proto.cpp b/protocols/Tox/src/tox_proto.cpp
index d249a59a86..7efbe6c7a6 100644
--- a/protocols/Tox/src/tox_proto.cpp
+++ b/protocols/Tox/src/tox_proto.cpp
@@ -157,7 +157,7 @@ int CToxProto::SetStatus(int iNewStatus)
toxThread = NULL;
}
- if (!Miranda_Terminated())
+ if (!Miranda_IsTerminated())
{
SetAllContactsStatus(ID_STATUS_OFFLINE);
CloseAllChatChatSessions();
diff --git a/protocols/Tox/src/tox_utils.cpp b/protocols/Tox/src/tox_utils.cpp
index 009c32b867..c8fb9e6b2b 100644
--- a/protocols/Tox/src/tox_utils.cpp
+++ b/protocols/Tox/src/tox_utils.cpp
@@ -105,7 +105,7 @@ wchar_t* CToxProto::ToxErrorToString(TOX_ERR_FRIEND_SEND_MESSAGE error)
void CToxProto::ShowNotification(const wchar_t *caption, const wchar_t *message, int flags, MCONTACT hContact)
{
- if (Miranda_Terminated())
+ if (Miranda_IsTerminated())
{
return;
}
diff --git a/protocols/Twitter/src/connection.cpp b/protocols/Twitter/src/connection.cpp
index 913bcd70e2..b23c3a3d5a 100644
--- a/protocols/Twitter/src/connection.cpp
+++ b/protocols/Twitter/src/connection.cpp
@@ -417,7 +417,7 @@ void TwitterProto::UpdateAvatarWorker(void *p)
debugLogA("***** Updating avatar: %s", data->url.c_str());
mir_cslock lck(avatar_lock_);
- if (CallService(MS_SYSTEM_TERMINATED, 0, 0)) // if miranda is shutting down...
+ if (Miranda_IsTerminated()) // if miranda is shutting down...
{
debugLogA("***** Terminating avatar update early: %s", data->url.c_str());
return;
diff --git a/protocols/WhatsApp/src/main.cpp b/protocols/WhatsApp/src/main.cpp
index 7905c42ccc..54da26d108 100644
--- a/protocols/WhatsApp/src/main.cpp
+++ b/protocols/WhatsApp/src/main.cpp
@@ -81,7 +81,7 @@ extern "C" int __declspec(dllexport) Load(void)
// Init native User-Agent
WORD v[4];
- CallService(MS_SYSTEM_GETFILEVERSION, 0, LPARAM(&v));
+ Miranda_GetFileVersion(&v);
WAConnection::globalInit();
return 0;
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-26 21:01:55 +0000