Channel Manager button went to core

4 files changed, 2 insertions, 21 deletions

diff --git a/plugins/Scriver/src/chat_window.cpp b/plugins/Scriver/src/chat_window.cpp
index 8bfbe4b327..6c43be27ca 100644
--- a/plugins/Scriver/src/chat_window.cpp
+++ b/plugins/Scriver/src/chat_window.cpp
@@ -759,7 +759,6 @@ CChatRoomDlg::CChatRoomDlg(SESSION_INFO *si)
 

 	m_btnOk.OnClick = Callback(this, &CChatRoomDlg::onClick_Ok);

 	m_btnFilter.OnClick = Callback(this, &CChatRoomDlg::onClick_Filter);

-	m_btnChannelMgr.OnClick = Callback(this, &CChatRoomDlg::onClick_ChanMgr);

 	m_btnNickList.OnClick = Callback(this, &CChatRoomDlg::onClick_ShowList);

 

 	m_nickList.OnDblClick = Callback(this, &CChatRoomDlg::onDblClick_List);

@@ -944,12 +943,6 @@ void CChatRoomDlg::onClick_Ok(CCtrlButton *pButton)
 	SetFocus(m_message.GetHwnd());

 }

 

-void CChatRoomDlg::onClick_ChanMgr(CCtrlButton *pButton)

-{

-	if (pButton->Enabled())

-		DoEventHook(GC_USER_CHANMGR, nullptr, nullptr, 0);

-}

-

 void CChatRoomDlg::onClick_ShowList(CCtrlButton *pButton)

 {

 	if (!pButton->Enabled() || m_si->iType == GCW_SERVER)

diff --git a/plugins/Scriver/src/msgs.h b/plugins/Scriver/src/msgs.h
index 5fba8353a2..d742939075 100644
--- a/plugins/Scriver/src/msgs.h
+++ b/plugins/Scriver/src/msgs.h
@@ -213,7 +213,6 @@ public:
 

 	void onClick_Ok(CCtrlButton*);

 	void onClick_Filter(CCtrlButton*);

-	void onClick_ChanMgr(CCtrlButton*);

 	void onClick_ShowList(CCtrlButton*);

 

 	void onDblClick_List(CCtrlListBox*);

diff --git a/plugins/TabSRMM/src/chat_window.cpp b/plugins/TabSRMM/src/chat_window.cpp
index b9e94532df..c44124fda4 100644
--- a/plugins/TabSRMM/src/chat_window.cpp
+++ b/plugins/TabSRMM/src/chat_window.cpp
@@ -1388,7 +1388,6 @@ CChatRoomDlg::CChatRoomDlg(SESSION_INFO *si)
 	m_btnOk.OnClick = Callback(this, &CChatRoomDlg::onClick_OK);
 	m_btnFilter.OnClick = Callback(this, &CChatRoomDlg::onClick_Filter);
 	m_btnNickList.OnClick = Callback(this, &CChatRoomDlg::onClick_ShowNickList);
-	m_btnChannelMgr.OnClick = Callback(this, &CChatRoomDlg::onClick_ChanMgr);
 	
 	m_message.OnChange = Callback(this, &CChatRoomDlg::onChange_Message);
 
@@ -1602,8 +1601,7 @@ void CChatRoomDlg::onClick_Filter(CCtrlButton *pButton)
 	}
 	else m_bFilterEnabled = !m_bFilterEnabled;
 
-	m_btnFilter.SendMsg(BUTTONSETOVERLAYICON,
-		(LPARAM)(m_bFilterEnabled ? PluginConfig.g_iconOverlayEnabled : PluginConfig.g_iconOverlayDisabled), 0);
+	m_btnFilter.SendMsg(BUTTONSETOVERLAYICON, (LPARAM)(m_bFilterEnabled ? PluginConfig.g_iconOverlayEnabled : PluginConfig.g_iconOverlayDisabled), 0);
 
 	if (m_bFilterEnabled && M.GetByte(CHAT_MODULE, "RightClickFilter", 0) == 0) {
 		ShowFilterMenu();
@@ -1616,9 +1614,7 @@ void CChatRoomDlg::onClick_Filter(CCtrlButton *pButton)
 
 void CChatRoomDlg::onClick_ShowNickList(CCtrlButton *pButton)
 {
-	if (!pButton->Enabled())
-		return;
-	if (m_si->iType == GCW_SERVER)
+	if (!pButton->Enabled() || m_si->iType == GCW_SERVER)
 		return;
 
 	m_bNicklistEnabled = !m_bNicklistEnabled;
@@ -1629,12 +1625,6 @@ void CChatRoomDlg::onClick_ShowNickList(CCtrlButton *pButton)
 	ScrollToBottom();
 }
 
-void CChatRoomDlg::onClick_ChanMgr(CCtrlButton *pButton)
-{
-	if (pButton->Enabled())
-		DoEventHook(GC_USER_CHANMGR, nullptr, nullptr, 0);
-}
-
 void CChatRoomDlg::onChange_Message(CCtrlEdit*)
 {
 	if (m_pContainer->m_hwndActive == m_hwnd)
diff --git a/plugins/TabSRMM/src/msgs.h b/plugins/TabSRMM/src/msgs.h
index cbd24d1ca3..1bbefadf41 100644
--- a/plugins/TabSRMM/src/msgs.h
+++ b/plugins/TabSRMM/src/msgs.h
@@ -520,7 +520,6 @@ public:
 

 	void onClick_OK(CCtrlButton*);

 	void onClick_Filter(CCtrlButton*);

-	void onClick_ChanMgr(CCtrlButton*);

 	void onClick_ShowNickList(CCtrlButton*);

 

 	void onChange_Message(CCtrlEdit*);