diff options
| author | George Hazan <ghazan@miranda.im> | 2023-03-18 17:51:45 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2023-03-18 17:51:45 +0300 |
| commit | 5dd6a8093a3390e52fbddf4ad099c076ebd897c7 (patch) | |
| tree | a73d2d978435f179de78920fd3fd3153ab1e5f77 /plugins | |
| parent | 2f44c5207ebad98dbf8d8e5b5d5689f32b01f0dc (diff) | |
fixes #3438 (tabSRMM: crash in highlight)
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/Scriver/src/chat.h | 4 | ||||
| -rw-r--r-- | plugins/Scriver/src/chat_main.cpp | 2 | ||||
| -rw-r--r-- | plugins/Scriver/src/chat_options.cpp | 4 | ||||
| -rw-r--r-- | plugins/TabSRMM/src/chat.h | 5 | ||||
| -rw-r--r-- | plugins/TabSRMM/src/chat_main.cpp | 2 |
5 files changed, 4 insertions, 13 deletions
diff --git a/plugins/Scriver/src/chat.h b/plugins/Scriver/src/chat.h index 48ad5567d3..194cd2723c 100644 --- a/plugins/Scriver/src/chat.h +++ b/plugins/Scriver/src/chat.h @@ -55,10 +55,6 @@ struct LOGSTREAMDATA : public GCLogStreamDataBase BOOL isFirst;
};
-struct SESSION_INFO : public GCSessionInfoBase
-{
-};
-
struct GlobalLogSettings : public GlobalLogSettingsBase
{
HFONT MessageBoxFont;
diff --git a/plugins/Scriver/src/chat_main.cpp b/plugins/Scriver/src/chat_main.cpp index 4538572531..c5964f3219 100644 --- a/plugins/Scriver/src/chat_main.cpp +++ b/plugins/Scriver/src/chat_main.cpp @@ -145,7 +145,7 @@ static void ShowRoom(SESSION_INFO *si) int Chat_Load()
{
- CHAT_MANAGER_INITDATA data = { &g_Settings, sizeof(MODULEINFO), sizeof(SESSION_INFO), LPGENW("Messaging") L"/" LPGENW("Group chats"), FONTMODE_SKIP, &g_plugin };
+ CHAT_MANAGER_INITDATA data = { &g_Settings, sizeof(MODULEINFO), LPGENW("Messaging") L"/" LPGENW("Group chats"), FONTMODE_SKIP, &g_plugin };
Chat_CustomizeApi(&data);
g_chatApi.MM_CreateModule = MM_CreateModule;
diff --git a/plugins/Scriver/src/chat_options.cpp b/plugins/Scriver/src/chat_options.cpp index f4b5f35669..537d63473e 100644 --- a/plugins/Scriver/src/chat_options.cpp +++ b/plugins/Scriver/src/chat_options.cpp @@ -524,8 +524,8 @@ static INT_PTR CALLBACK DlgProcOptions2(HWND hwndDlg, UINT uMsg, WPARAM wParam, mir_free(pszText);
g_Settings.dwIconFlags = db_get_dw(0, CHAT_MODULE, "IconFlags", 0x0000);
- g_Settings.dwTrayIconFlags = db_get_dw(0, CHAT_MODULE, "TrayIconFlags", 0x1000);
- g_Settings.dwPopupFlags = db_get_dw(0, CHAT_MODULE, "PopupFlags", 0x0000);
+ g_Settings.dwTrayIconFlags = db_get_dw(0, CHAT_MODULE, "TrayIconFlags", GC_EVENT_HIGHLIGHT);
+ g_Settings.dwPopupFlags = db_get_dw(0, CHAT_MODULE, "PopupFlags", GC_EVENT_HIGHLIGHT);
g_Settings.bStripFormat = db_get_b(0, CHAT_MODULE, "TrimFormatting", 0) != 0;
g_Settings.bLogIndentEnabled = (db_get_b(0, CHAT_MODULE, "LogIndentEnabled", 1) != 0) ? TRUE : FALSE;
diff --git a/plugins/TabSRMM/src/chat.h b/plugins/TabSRMM/src/chat.h index 75ceea90cf..08a4bf6a8d 100644 --- a/plugins/TabSRMM/src/chat.h +++ b/plugins/TabSRMM/src/chat.h @@ -50,11 +50,6 @@ struct MODULEINFO : public GCModuleInfoBase wchar_t tszIdleMsg[60];
};
-struct SESSION_INFO : public GCSessionInfoBase
-{
- int iLogTrayFlags, iLogPopupFlags;
-};
-
struct LOGSTREAMDATA : public GCLogStreamDataBase
{
int crCount;
diff --git a/plugins/TabSRMM/src/chat_main.cpp b/plugins/TabSRMM/src/chat_main.cpp index b398955f21..395a51a05e 100644 --- a/plugins/TabSRMM/src/chat_main.cpp +++ b/plugins/TabSRMM/src/chat_main.cpp @@ -353,7 +353,7 @@ int Chat_Load() CheckUpdate();
Utils::RTF_CTableInit();
- CHAT_MANAGER_INITDATA data = { &g_Settings, sizeof(MODULEINFO), sizeof(SESSION_INFO), LPGENW("Message sessions") L"/" LPGENW("Group chats"), FONTMODE_ALTER, &g_plugin };
+ CHAT_MANAGER_INITDATA data = { &g_Settings, sizeof(MODULEINFO), LPGENW("Message sessions") L"/" LPGENW("Group chats"), FONTMODE_ALTER, &g_plugin };
Chat_CustomizeApi(&data);
g_chatApi.CreateNick = OnCreateNick;
|