diff options
Diffstat (limited to 'plugins/MirFox')
| -rw-r--r-- | plugins/MirFox/src/MirandaUtils.cpp | 8 | ||||
| -rw-r--r-- | plugins/MirFox/src/MirfoxMiranda.cpp | 12 |
2 files changed, 10 insertions, 10 deletions
diff --git a/plugins/MirFox/src/MirandaUtils.cpp b/plugins/MirFox/src/MirandaUtils.cpp index b3d859ba60..dfaf7d73f0 100644 --- a/plugins/MirFox/src/MirandaUtils.cpp +++ b/plugins/MirFox/src/MirandaUtils.cpp @@ -68,7 +68,7 @@ std::wstring& MirandaUtils::getDisplayName() displayName.append(L"Miranda NG v.");
char mirandaVersion[128];
- CallService(MS_SYSTEM_GETVERSIONTEXT, (WPARAM)_countof(mirandaVersion), (LPARAM)mirandaVersion);
+ Miranda_GetVersionText(mirandaVersion, _countof(mirandaVersion));
displayName.append(_A2T(mirandaVersion));
displayName.append(L" (");
displayName.append(getProfileName());
@@ -175,11 +175,11 @@ void MirandaUtils::sendMessage(ActionThreadArgStruct* args, MFENUM_SEND_MESSAGE_ EnterCriticalSection(&ackMapCs);
myMfAck = ackMap[hProcess];
LeaveCriticalSection(&ackMapCs);
- if(Miranda_Terminated() || args->mirfoxDataPtr->Plugin_Terminated){
- logger->log_p(L"SMTC: ACK break by Plugin_Terminated (=%d) or Miranda_Terminated()", args->mirfoxDataPtr->Plugin_Terminated);
+ if(Miranda_IsTerminated() || args->mirfoxDataPtr->Plugin_Terminated){
+ logger->log_p(L"SMTC: ACK break by Plugin_Terminated (=%d) or Miranda_IsTerminated()", args->mirfoxDataPtr->Plugin_Terminated);
break;
}
- } while (myMfAck == NULL && counter <= MAX_ACK_WAIT_COUNTER); //TODO or Plugin_Terminated or Miranda_Terminated()
+ } while (myMfAck == NULL && counter <= MAX_ACK_WAIT_COUNTER); //TODO or Plugin_Terminated or Miranda_IsTerminated()
logger->log_p(L"SMTC: ACK found counter = [%d] myMfAck = [" SCNuPTR L"]", counter, myMfAck);
}
diff --git a/plugins/MirFox/src/MirfoxMiranda.cpp b/plugins/MirFox/src/MirfoxMiranda.cpp index f5d64b0450..0a59139994 100644 --- a/plugins/MirFox/src/MirfoxMiranda.cpp +++ b/plugins/MirFox/src/MirfoxMiranda.cpp @@ -121,7 +121,7 @@ void CMirfoxMiranda::onContactAdded_async(void* threadArg) bool canAdd = true;
// ceck miranda
- if (Miranda_Terminated() || mirfoxMiranda->getMirfoxData().Plugin_Terminated)
+ if (Miranda_IsTerminated() || mirfoxMiranda->getMirfoxData().Plugin_Terminated)
canAdd = false;
// check if hContact still exist
@@ -182,7 +182,7 @@ void CMirfoxMiranda::onContactSettingChanged_async(void* threadArg){ bool canAdd = true;
// ceck miranda
- if (Miranda_Terminated() || mirfoxMiranda->getMirfoxData().Plugin_Terminated)
+ if (Miranda_IsTerminated() || mirfoxMiranda->getMirfoxData().Plugin_Terminated)
canAdd = false;
// check if hContact still exist
@@ -393,8 +393,8 @@ void CMirfoxMiranda::csmThread(void* threadArg) SleepEx(CSMTHREAD_TICK_TIME, TRUE); //check exit every 0,1s
//if miranda is exiting - exit this thread
- if (Miranda_Terminated() || mirfoxDataPtr->Plugin_Terminated){
- logger->log_p(L"MirfoxMiranda::csmThread break by Plugin_Terminated (=%d) or Miranda_Terminated()", mirfoxDataPtr->Plugin_Terminated);
+ if (Miranda_IsTerminated() || mirfoxDataPtr->Plugin_Terminated){
+ logger->log_p(L"MirfoxMiranda::csmThread break by Plugin_Terminated (=%d) or Miranda_IsTerminated()", mirfoxDataPtr->Plugin_Terminated);
break;
}
@@ -540,8 +540,8 @@ void CMirfoxMiranda::msgQueueThread(void* threadArg) SleepEx(MQTHREAD_TICK_TIME, TRUE); //check exit every 0,1s
//if miranda is exiting - exit this thread
- if (Miranda_Terminated() || mirfoxDataPtr->Plugin_Terminated){
- logger->log_p(L"mqThread break by Plugin_Terminated (=%d) or Miranda_Terminated()", mirfoxDataPtr->Plugin_Terminated);
+ if (Miranda_IsTerminated() || mirfoxDataPtr->Plugin_Terminated){
+ logger->log_p(L"mqThread break by Plugin_Terminated (=%d) or Miranda_IsTerminated()", mirfoxDataPtr->Plugin_Terminated);
delete [] userActionSelection;
break;
}
|