diff options
| author | George Hazan <ghazan@miranda.im> | 2017-02-20 00:10:11 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2017-02-20 00:10:11 +0300 |
| commit | 3c6f03b917700b8f0fb1d7104db8ddd593ab7bf6 (patch) | |
| tree | d18bdb2baa7f17b59d3c26d717bfb927a96dff85 /plugins/TabSRMM | |
| parent | 227c87a42780843f76b262e91f1ef2c270d74f3b (diff) | |
TabSRMM: default mask values must match options
Diffstat (limited to 'plugins/TabSRMM')
| -rw-r--r-- | plugins/TabSRMM/src/chat/options.cpp | 4 | ||||
| -rw-r--r-- | plugins/TabSRMM/src/chat/tools.cpp | 14 |
2 files changed, 7 insertions, 11 deletions
diff --git a/plugins/TabSRMM/src/chat/options.cpp b/plugins/TabSRMM/src/chat/options.cpp index ef0e21e16a..20de6212ae 100644 --- a/plugins/TabSRMM/src/chat/options.cpp +++ b/plugins/TabSRMM/src/chat/options.cpp @@ -932,10 +932,6 @@ static UINT _eventorder[] = GC_EVENT_HIGHLIGHT
};
-#define GC_EVENT_ALL (GC_EVENT_ACTION | GC_EVENT_MESSAGE | GC_EVENT_NICK | GC_EVENT_JOIN | \
- GC_EVENT_PART | GC_EVENT_TOPIC | GC_EVENT_ADDSTATUS | GC_EVENT_INFORMATION | GC_EVENT_QUIT | \
- GC_EVENT_KICK | GC_EVENT_NOTICE)
-
// Dialog procedure for group chat options tab #3 (event filter configuration)
INT_PTR CALLBACK DlgProcOptions3(HWND hwndDlg, UINT uMsg, WPARAM, LPARAM lParam)
{
diff --git a/plugins/TabSRMM/src/chat/tools.cpp b/plugins/TabSRMM/src/chat/tools.cpp index 1168dec2ee..9be9b80567 100644 --- a/plugins/TabSRMM/src/chat/tools.cpp +++ b/plugins/TabSRMM/src/chat/tools.cpp @@ -613,8 +613,8 @@ void Chat_SetFilters(SESSION_INFO *si) if (si == NULL)
return;
- DWORD dwFlags_default = M.GetDword(CHAT_MODULE, "FilterFlags", 0x03E0);
- DWORD dwFlags_local = db_get_dw(si->hContact, CHAT_MODULE, "FilterFlags", 0x03E0);
+ DWORD dwFlags_default = M.GetDword(CHAT_MODULE, "FilterFlags", GC_EVENT_ALL);
+ DWORD dwFlags_local = db_get_dw(si->hContact, CHAT_MODULE, "FilterFlags", GC_EVENT_ALL);
DWORD dwMask = db_get_dw(si->hContact, CHAT_MODULE, "FilterMask", 0);
si->iLogFilterFlags = dwFlags_default;
@@ -624,8 +624,8 @@ void Chat_SetFilters(SESSION_INFO *si) si->iLogFilterFlags = (dwFlags_local & dwBit) ? si->iLogFilterFlags | dwBit : si->iLogFilterFlags & ~dwBit;
}
- dwFlags_default = M.GetDword(CHAT_MODULE, "PopupFlags", 0x03E0);
- dwFlags_local = db_get_dw(si->hContact, CHAT_MODULE, "PopupFlags", 0x03E0);
+ dwFlags_default = M.GetDword(CHAT_MODULE, "PopupFlags", GC_EVENT_HIGHLIGHT);
+ dwFlags_local = db_get_dw(si->hContact, CHAT_MODULE, "PopupFlags", GC_EVENT_HIGHLIGHT);
dwMask = db_get_dw(si->hContact, CHAT_MODULE, "PopupMask", 0);
si->iLogPopupFlags = dwFlags_default;
@@ -635,11 +635,11 @@ void Chat_SetFilters(SESSION_INFO *si) si->iLogPopupFlags = (dwFlags_local & dwBit) ? si->iLogPopupFlags | dwBit : si->iLogPopupFlags & ~dwBit;
}
- dwFlags_default = M.GetDword(CHAT_MODULE, "TrayIconFlags", 0x03E0);
- dwFlags_local = db_get_dw(si->hContact, CHAT_MODULE, "TrayIconFlags", 0x03E0);
+ dwFlags_default = M.GetDword(CHAT_MODULE, "TrayIconFlags", GC_EVENT_HIGHLIGHT);
+ dwFlags_local = db_get_dw(si->hContact, CHAT_MODULE, "TrayIconFlags", GC_EVENT_HIGHLIGHT);
dwMask = db_get_dw(si->hContact, CHAT_MODULE, "TrayIconMask", 0);
- si->iDiskLogFlags = M.GetDword(CHAT_MODULE, "DiskLogFlags", 0xFFFF);
+ si->iDiskLogFlags = M.GetDword(CHAT_MODULE, "DiskLogFlags", GC_EVENT_ALL);
si->iLogTrayFlags = dwFlags_default;
for (int i = 0; i < 32; i++) {
|