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 /src/core/stdmsg | |
| parent | d70004f376a18f4c44ff47d423f0715a050002fd (diff) | |
fixes #1397 (StdMsg: dynamic loading breaks meta menu)
Diffstat (limited to 'src/core/stdmsg')
| -rw-r--r-- | src/core/stdmsg/src/msgs.cpp | 2 | ||||
| -rw-r--r-- | src/core/stdmsg/src/statusicon.cpp | 10 | ||||
| -rw-r--r-- | src/core/stdmsg/src/statusicon.h | 1 |
3 files changed, 1 insertions, 12 deletions
diff --git a/src/core/stdmsg/src/msgs.cpp b/src/core/stdmsg/src/msgs.cpp index 869d679855..cdadeba179 100644 --- a/src/core/stdmsg/src/msgs.cpp +++ b/src/core/stdmsg/src/msgs.cpp @@ -479,8 +479,6 @@ static int SplitmsgModulesLoaded(WPARAM, LPARAM) int PreshutdownSendRecv(WPARAM, LPARAM)
{
Srmm_Broadcast(DM_CLOSETAB, 0, 0);
-
- DeinitStatusIcons();
return 0;
}
diff --git a/src/core/stdmsg/src/statusicon.cpp b/src/core/stdmsg/src/statusicon.cpp index 76509152cc..0246d2a762 100644 --- a/src/core/stdmsg/src/statusicon.cpp +++ b/src/core/stdmsg/src/statusicon.cpp @@ -67,20 +67,12 @@ void CheckStatusIconClick(MCONTACT hContact, HWND hwndFrom, POINT pt, const RECT sicd.dwId = sid->dwId;
sicd.szModule = sid->szModule;
sicd.flags = click_flags;
- NotifyEventHooks(hHookIconPressedEvt, hContact, (LPARAM)&sicd);
+ Srmm_ClickStatusIcon(hContact, &sicd);
}
int InitStatusIcons()
{
HookEvent(ME_MSG_ICONSCHANGED, OnSrmmIconChanged);
-
- hHookIconPressedEvt = CreateHookableEvent(ME_MSG_ICONPRESSED);
- return 0;
-}
-
-int DeinitStatusIcons()
-{
- DestroyHookableEvent(hHookIconPressedEvt);
return 0;
}
diff --git a/src/core/stdmsg/src/statusicon.h b/src/core/stdmsg/src/statusicon.h index 8a267917dc..209e411671 100644 --- a/src/core/stdmsg/src/statusicon.h +++ b/src/core/stdmsg/src/statusicon.h @@ -5,7 +5,6 @@ extern HANDLE hHookIconPressedEvt; extern int status_icon_list_size;
int InitStatusIcons();
-int DeinitStatusIcons();
int GetStatusIconsCount(MCONTACT hContact);
void DrawStatusIcons(MCONTACT hContact, HDC hdc, const RECT &rc, int gap);
|