summaryrefslogtreecommitdiff
path: root/plugins/TabSRMM/src/chat_tools.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/TabSRMM/src/chat_tools.cpp')
-rw-r--r--plugins/TabSRMM/src/chat_tools.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/plugins/TabSRMM/src/chat_tools.cpp b/plugins/TabSRMM/src/chat_tools.cpp
index 8a34696804..dd284321d7 100644
--- a/plugins/TabSRMM/src/chat_tools.cpp
+++ b/plugins/TabSRMM/src/chat_tools.cpp
@@ -283,7 +283,7 @@ void DoFlashAndSoundWorker(FLASH_PARAMS *p)
UpdateTrayMenu(dat, si->wStatus, si->pszModule, dat->m_wszStatus, si->hContact, 1);
}
- mir_free(p);
+ delete p;
}
BOOL DoSoundsFlashPopupTrayStuff(SESSION_INFO *si, GCEVENT *gce, BOOL bHighlight, int bManyFix)
@@ -292,15 +292,15 @@ BOOL DoSoundsFlashPopupTrayStuff(SESSION_INFO *si, GCEVENT *gce, BOOL bHighlight
return FALSE;
CMsgDialog *dat = nullptr;
- FLASH_PARAMS *params = (FLASH_PARAMS*)mir_calloc(sizeof(FLASH_PARAMS));
+ auto *params = new FLASH_PARAMS();
params->hContact = si->hContact;
- params->bInactive = TRUE;
+ params->bInactive = true;
if (si->pDlg) {
dat = si->pDlg;
if ((si->pDlg->GetHwnd() == si->pDlg->m_pContainer->m_hwndActive) && GetForegroundWindow() == si->pDlg->m_pContainer->m_hwnd)
- params->bInactive = FALSE;
+ params->bInactive = false;
}
- params->bActiveTab = params->bMustFlash = params->bMustAutoswitch = FALSE;
+ params->bActiveTab = params->bMustFlash = params->bMustAutoswitch = false;
params->iEvent = gce->iType;
WPARAM wParamForHighLight = 0;
@@ -326,8 +326,8 @@ BOOL DoSoundsFlashPopupTrayStuff(SESSION_INFO *si, GCEVENT *gce, BOOL bHighlight
if (dat || !nen_options.iMUCDisable)
DoPopup(si, gce);
if (g_Settings.bFlashWindowHighlight && params->bInactive)
- params->bMustFlash = TRUE;
- params->bMustAutoswitch = TRUE;
+ params->bMustFlash = true;
+ params->bMustAutoswitch = true;
params->hNotifyIcon = g_chatApi.hIcons[ICON_HIGHLIGHT];
}
else {
@@ -436,9 +436,9 @@ BOOL DoSoundsFlashPopupTrayStuff(SESSION_INFO *si, GCEVENT *gce, BOOL bHighlight
}
if (params->iEvent == GC_EVENT_MESSAGE) {
- params->bMustAutoswitch = TRUE;
+ params->bMustAutoswitch = true;
if (g_Settings.bFlashWindow)
- params->bMustFlash = TRUE;
+ params->bMustFlash = true;
params->hNotifyIcon = g_chatApi.hIcons[ICON_MESSAGE];
}
}