From 741981732e0db3e4335c246fb511e02cce8946c6 Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Thu, 30 Mar 2023 19:29:05 +0300
Subject: fixes #3470 completely
---
plugins/TabSRMM/src/chat_tools.cpp | 2 +-
plugins/TabSRMM/src/msgdialog.cpp | 2 +-
plugins/TabSRMM/src/msgdlgother.cpp | 13 -------------
plugins/TabSRMM/src/msgs.h | 1 -
4 files changed, 2 insertions(+), 16 deletions(-)
(limited to 'plugins/TabSRMM')
diff --git a/plugins/TabSRMM/src/chat_tools.cpp b/plugins/TabSRMM/src/chat_tools.cpp
index ecba3d95b2..7ad4525575 100644
--- a/plugins/TabSRMM/src/chat_tools.cpp
+++ b/plugins/TabSRMM/src/chat_tools.cpp
@@ -371,7 +371,7 @@ void Chat_SetFilters(SESSION_INFO *si)
dwFlags = (dwFlags_local & dwBit) ? dwFlags | dwBit : dwFlags & ~dwBit;
}
- pDlg->SetFilter(dwFlags);
+ pDlg->m_iLogFilterFlags = dwFlags;
}
uint32_t dwFlags_local = db_get_dw(si->hContact, CHAT_MODULE, "PopupFlags", GC_EVENT_HIGHLIGHT);
diff --git a/plugins/TabSRMM/src/msgdialog.cpp b/plugins/TabSRMM/src/msgdialog.cpp
index 32bf54c22d..75e977a799 100644
--- a/plugins/TabSRMM/src/msgdialog.cpp
+++ b/plugins/TabSRMM/src/msgdialog.cpp
@@ -1000,7 +1000,7 @@ void CMsgDialog::onClick_Filter(CCtrlButton *pButton)
db_set_b(m_si->hContact, CHAT_MODULE, "FilterEnabled", m_bFilterEnabled);
Chat_SetFilters(m_si);
- if (m_bFilterEnabled && !g_chatApi.bRightClickFilter)
+ if (m_bFilterEnabled && !g_chatApi.bRightClickFilter)
ShowFilterMenu();
else {
RedrawLog();
diff --git a/plugins/TabSRMM/src/msgdlgother.cpp b/plugins/TabSRMM/src/msgdlgother.cpp
index a570c184bc..7fd05e5861 100644
--- a/plugins/TabSRMM/src/msgdlgother.cpp
+++ b/plugins/TabSRMM/src/msgdlgother.cpp
@@ -1977,19 +1977,6 @@ void TSAPI CleanTempFiles()
}
}
-/////////////////////////////////////////////////////////////////////////////////////////
-
-void CMsgDialog::SetFilter(uint32_t dwFlags)
-{
- m_iLogFilterFlags = dwFlags;
-
- if (dwFlags == 0) {
- m_bFilterEnabled = false;
- m_btnFilter.Disable();
- }
- else m_btnFilter.Enable();
-}
-
/////////////////////////////////////////////////////////////////////////////////////////
// Sets a status bar text for a contact
diff --git a/plugins/TabSRMM/src/msgs.h b/plugins/TabSRMM/src/msgs.h
index 900a55b450..6d05b1a25f 100644
--- a/plugins/TabSRMM/src/msgs.h
+++ b/plugins/TabSRMM/src/msgs.h
@@ -691,7 +691,6 @@ public:
void SaveSplitter(void);
void SelectContainer(void);
void SetDialogToType(void);
- void SetFilter(uint32_t dwFlags);
void ShowPicture(bool showNewPic);
void SplitterMoved(int x, HWND hwnd);
void SwitchToContainer(const wchar_t *szNewName);
--
cgit v1.2.3