diff options
| author | George Hazan <ghazan@miranda.im> | 2016-12-02 23:55:15 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2016-12-02 23:55:15 +0300 |
| commit | 4882bc420186a4aef19be699e3f621dec932417d (patch) | |
| tree | 4bd45d158a1a1470d590edbbb71098721d650333 /protocols/IRCG/src | |
| parent | 10091bbca1380a1d8e3b9d61b8c175490036af5b (diff) | |
MS_SYSTEM_* services became functions
Diffstat (limited to 'protocols/IRCG/src')
| -rw-r--r-- | protocols/IRCG/src/commandmonitor.cpp | 2 | ||||
| -rw-r--r-- | protocols/IRCG/src/input.cpp | 2 | ||||
| -rw-r--r-- | protocols/IRCG/src/irclib.cpp | 2 | ||||
| -rw-r--r-- | protocols/IRCG/src/services.cpp | 2 |
4 files changed, 4 insertions, 4 deletions
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()) {
|