SRMM notifications went to the core with ME_MSG_WINDOWEVENT

1 files changed, 4 insertions, 10 deletions

diff --git a/plugins/TabSRMM/src/msgdialog.cpp b/plugins/TabSRMM/src/msgdialog.cpp
index 8f73008fb2..8c856fbdc8 100644
--- a/plugins/TabSRMM/src/msgdialog.cpp
+++ b/plugins/TabSRMM/src/msgdialog.cpp
@@ -725,7 +725,7 @@ void CSrmmWindow::OnInitDialog()
 	SendDlgItemMessage(m_hwnd, IDC_TOGGLESIDEBAR, BUTTONSETCONTAINER, (LPARAM)m_pContainer, 0);

 	SendDlgItemMessage(m_hwnd, IDC_TOGGLESIDEBAR, BUTTONSETASTOOLBARBUTTON, TRUE, 0);

 

-	FireEvent(MSG_WINDOW_EVT_OPENING);

+	NotifyEvent(MSG_WINDOW_EVT_OPENING);

 

 	for (int i = 0; i < _countof(tooltips); i++)

 		SendDlgItemMessage(m_hwnd, tooltips[i].id, BUTTONADDTOOLTIP, (WPARAM)TranslateW(tooltips[i].text), BATF_UNICODE);

@@ -858,7 +858,7 @@ void CSrmmWindow::OnInitDialog()
 		mir_subclassWindow(m_hwndHPP, HPPKFSubclassProc);

 

 	m_dwFlags &= ~MWF_INITMODE;

-	FireEvent(MSG_WINDOW_EVT_OPEN);

+	NotifyEvent(MSG_WINDOW_EVT_OPEN);

 

 	if (m_pContainer->dwFlags & CNT_CREATE_MINIMIZED) {

 		m_pContainer->dwFlags &= ~CNT_CREATE_MINIMIZED;

@@ -887,7 +887,7 @@ void CSrmmWindow::OnDestroy()
 		DestroyWindow(m_hwndPanelPicParent);

 

 	if (m_cache->isValid()) { // not valid means the contact was deleted

-		FireEvent(MSG_WINDOW_EVT_CLOSING);

+		NotifyEvent(MSG_WINDOW_EVT_CLOSING);

 		AddContactToFavorites(m_hContact, m_cache->getNick(), m_cache->getActiveProto(), m_wszStatus, m_wStatus,

 			Skin_LoadProtoIcon(m_cache->getActiveProto(), m_cache->getActiveStatus()), 1, PluginConfig.g_hMenuRecent);

 		if (m_hContact) {

@@ -946,7 +946,7 @@ void CSrmmWindow::OnDestroy()
 		m_iTabID = -1;

 	}

 

-	FireEvent(MSG_WINDOW_EVT_CLOSE);

+	NotifyEvent(MSG_WINDOW_EVT_CLOSE);

 

 	// clean up IEView and H++ log windows

 	if (m_hwndIEView != 0) {

@@ -1168,12 +1168,6 @@ void CSrmmWindow::onClick_Ok(CCtrlButton*)
 		DM_NotifyTyping(PROTOTYPE_SELFTYPING_OFF);

 

 	DeletePopupsForContact(m_hContact, PU_REMOVE_ON_SEND);

-	if (M.GetByte("allow_sendhook", 0)) {

-		int result = FireEvent(MSG_WINDOW_EVT_CUSTOM, MAKELONG(flags, tabMSG_WINDOW_EVT_CUSTOM_BEFORESEND));

-		if (result)

-			return;

-	}

-

 	sendQueue->addTo(this, memRequired, flags);

 }