diff options
| author | George Hazan <ghazan@miranda.im> | 2018-05-31 12:24:51 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2018-05-31 12:24:58 +0300 |
| commit | 8bd59593912495db8b41f885c1c9c8c5687e4156 (patch) | |
| tree | 58cff42775b59a620261b62bb91f82f130e0e782 /plugins/TabSRMM | |
| parent | d70004f376a18f4c44ff47d423f0715a050002fd (diff) | |
fixes #1397 (StdMsg: dynamic loading breaks meta menu)
Diffstat (limited to 'plugins/TabSRMM')
| -rw-r--r-- | plugins/TabSRMM/src/generic_msghandlers.cpp | 11 | ||||
| -rw-r--r-- | plugins/TabSRMM/src/globals.cpp | 1 | ||||
| -rw-r--r-- | plugins/TabSRMM/src/msgs.h | 1 |
3 files changed, 1 insertions, 12 deletions
diff --git a/plugins/TabSRMM/src/generic_msghandlers.cpp b/plugins/TabSRMM/src/generic_msghandlers.cpp index e2554acf5f..ca06a2a07c 100644 --- a/plugins/TabSRMM/src/generic_msghandlers.cpp +++ b/plugins/TabSRMM/src/generic_msghandlers.cpp @@ -1352,7 +1352,6 @@ void CTabBaseDlg::DM_HandleAutoSizeRequest(REQRESIZE* rr) // status icon stuff (by sje, used for indicating encryption status in the status bar // this is now part of the message window api -static HANDLE hHookIconPressedEvt; static int OnSrmmIconChanged(WPARAM hContact, LPARAM) { @@ -1459,7 +1458,7 @@ void CTabBaseDlg::CheckStatusIconClick(POINT pt, const RECT &rc, int gap, int co sicd.dwId = sid->dwId; sicd.szModule = sid->szModule; sicd.flags = (code == NM_RCLICK ? MBCF_RIGHTBUTTON : 0); - NotifyEventHooks(hHookIconPressedEvt, m_hContact, (LPARAM)&sicd); + Srmm_ClickStatusIcon(m_hContact, &sicd); InvalidateRect(m_pContainer->hwndStatus, nullptr, TRUE); } } @@ -1534,13 +1533,5 @@ int SI_InitStatusIcons() Srmm_AddIcon(&sid, g_plugin.m_hLang); HookEvent(ME_MSG_ICONSCHANGED, OnSrmmIconChanged); - - hHookIconPressedEvt = CreateHookableEvent(ME_MSG_ICONPRESSED); - return 0; -} - -int SI_DeinitStatusIcons() -{ - DestroyHookableEvent(hHookIconPressedEvt); return 0; } diff --git a/plugins/TabSRMM/src/globals.cpp b/plugins/TabSRMM/src/globals.cpp index bdc5bdc3ec..544fc9cc98 100644 --- a/plugins/TabSRMM/src/globals.cpp +++ b/plugins/TabSRMM/src/globals.cpp @@ -454,7 +454,6 @@ int CGlobals::PreshutdownSendRecv(WPARAM, LPARAM) for (auto &hContact : Contacts())
db_set_dw(hContact, SRMSGMOD_T, "messagecount", 0);
- ::SI_DeinitStatusIcons();
::NEN_WriteOptions(&nen_options);
::DestroyWindow(PluginConfig.g_hwndHotkeyHandler);
diff --git a/plugins/TabSRMM/src/msgs.h b/plugins/TabSRMM/src/msgs.h index 166247d4c1..1f75548e90 100644 --- a/plugins/TabSRMM/src/msgs.h +++ b/plugins/TabSRMM/src/msgs.h @@ -1100,7 +1100,6 @@ struct SIDEBARITEM { #define MSG_ICON_SOUND 2
int SI_InitStatusIcons();
-int SI_DeinitStatusIcons();
struct SKINDESC
{
|