From 6bf18e4265c8a0938d12e98eef1562b1ee4bc97b Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Thu, 9 Mar 2017 14:30:35 +0300
Subject: any CSrmmBaseDialog descendant can refer to SESSION_INFO, not only
 CChatRoomDlg

---
 plugins/TabSRMM/src/container.cpp | 28 +++++++++-------------------
 1 file changed, 9 insertions(+), 19 deletions(-)

(limited to 'plugins/TabSRMM/src/container.cpp')

diff --git a/plugins/TabSRMM/src/container.cpp b/plugins/TabSRMM/src/container.cpp
index 9c825c1ad4..3503354b83 100644
--- a/plugins/TabSRMM/src/container.cpp
+++ b/plugins/TabSRMM/src/container.cpp
@@ -60,7 +60,7 @@ void TSAPI SetAeroMargins(TContainerData *pContainer)
 		return;
 
 	RECT	rcWnd;
-	if (dat->m_bType == SESSIONTYPE_IM) {
+	if (!dat->isChat()) {
 		if (dat->m_pPanel.isActive())
 			GetWindowRect(GetDlgItem(dat->GetHwnd(), IDC_LOG), &rcWnd);
 		else
@@ -872,13 +872,10 @@ panel_found:
 				db_unset(dat->m_hContact, SRMSGMOD_T, "tabindex");
 				break;
 			case ID_TABMENU_LEAVECHATROOM:
-				if (dat && dat->m_bType == SESSIONTYPE_CHAT) {
-					SESSION_INFO *si = dat->si;
-					if (si && dat->m_hContact) {
-						char *szProto = GetContactProto(dat->m_hContact);
-						if (szProto)
-							CallProtoService(szProto, PS_LEAVECHAT, dat->m_hContact, 0);
-					}
+				if (dat && dat->isChat() && dat->m_hContact) {
+					char *szProto = GetContactProto(dat->m_hContact);
+					if (szProto)
+						CallProtoService(szProto, PS_LEAVECHAT, dat->m_hContact, 0);
 				}
 				break;
 			case ID_TABMENU_ATTACHTOCONTAINER:
@@ -1239,7 +1236,7 @@ panel_found:
 			}
 
 			dat = (CTabBaseDlg*)GetWindowLongPtr(pContainer->hwndActive, GWLP_USERDATA);
-			if (dat && dat->m_bType == SESSIONTYPE_IM) {
+			if (dat && !dat->isChat()) {
 				if (dat->m_idle && pContainer->hwndActive && IsWindow(pContainer->hwndActive))
 					dat->m_pPanel.Invalidate(TRUE);
 			}
@@ -2362,7 +2359,7 @@ void TSAPI ReflashContainer(TContainerData *pContainer)
 
 // broadcasts a message to all child windows (tabs/sessions)
 
-void TSAPI BroadCastContainer(const TContainerData *pContainer, UINT message, WPARAM wParam, LPARAM lParam, BYTE bType)
+void TSAPI BroadCastContainer(const TContainerData *pContainer, UINT message, WPARAM wParam, LPARAM lParam)
 {
 	if (pContainer == nullptr)
 		return;
@@ -2374,15 +2371,8 @@ void TSAPI BroadCastContainer(const TContainerData *pContainer, UINT message, WP
 	int nCount = TabCtrl_GetItemCount(hwndTab);
 	for (int i = 0; i < nCount; i++) {
 		TabCtrl_GetItem(hwndTab, i, &item);
-		if (IsWindow((HWND)item.lParam)) {
-			if (bType == SESSIONTYPE_ANY)
-				SendMessage((HWND)item.lParam, message, wParam, lParam);
-			else {
-				CTabBaseDlg *dat = (CTabBaseDlg*)GetWindowLongPtr((HWND)item.lParam, GWLP_USERDATA);
-				if (dat && dat->m_bType == bType)
-					SendMessage((HWND)item.lParam, message, wParam, lParam);
-			}
-		}
+		if (IsWindow((HWND)item.lParam))
+			SendMessage((HWND)item.lParam, message, wParam, lParam);
 	}
 }
 
-- 
cgit v1.2.3