diff options
| author | George Hazan <ghazan@miranda.im> | 2019-03-28 00:01:57 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2019-03-28 00:02:08 +0300 |
| commit | 874bfd75183b781c0087087502133f5bea8ade1c (patch) | |
| tree | 4f7c8c08ee71005b69574ae3820ddd7611894f52 /src | |
| parent | 7e852468c6d1a45cd4c78c4744b74e51d29e26b0 (diff) | |
Menu_ModifyItem to receive icolib handle, not HICON
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/stdaway/src/awaymsg.cpp | 2 | ||||
| -rw-r--r-- | src/core/stdpopup/src/services.cpp | 8 | ||||
| -rw-r--r-- | src/mir_app/src/menu_clist.cpp | 16 |
3 files changed, 8 insertions, 18 deletions
diff --git a/src/core/stdaway/src/awaymsg.cpp b/src/core/stdaway/src/awaymsg.cpp index c84412cbd8..aaf78dacc8 100644 --- a/src/core/stdaway/src/awaymsg.cpp +++ b/src/core/stdaway/src/awaymsg.cpp @@ -141,7 +141,7 @@ static int AwayMsgPreBuildMenu(WPARAM hContact, LPARAM) if (CallProtoService(szProto, PS_GETCAPS, PFLAGNUM_3, 0) & Proto_Status2Flag(status)) {
wchar_t str[128];
mir_snwprintf(str, TranslateT("Re&ad %s message"), Clist_GetStatusModeDescription(status, 0));
- Menu_ModifyItem(hAwayMsgMenuItem, str, Skin_LoadProtoIcon(szProto, status), CMIF_NOTOFFLINE);
+ Menu_ModifyItem(hAwayMsgMenuItem, str, Skin_GetProtoIcon(szProto, status), CMIF_NOTOFFLINE);
return 0;
}
}
diff --git a/src/core/stdpopup/src/services.cpp b/src/core/stdpopup/src/services.cpp index 7b853e9f93..757e47032b 100644 --- a/src/core/stdpopup/src/services.cpp +++ b/src/core/stdpopup/src/services.cpp @@ -195,12 +195,12 @@ void UpdateMenu() { bool isEnabled = Popup_Enabled() == 1; if (isEnabled) { - Menu_ModifyItem(hMenuItem, LPGENW("Disable popups"), IcoLib_GetIcon(ICO_POPUP_ON)); - Menu_ModifyItem(hMenuRoot, nullptr, IcoLib_GetIcon(ICO_POPUP_ON)); + Menu_ModifyItem(hMenuItem, LPGENW("Disable popups"), IcoLib_GetIconHandle(ICO_POPUP_ON)); + Menu_ModifyItem(hMenuRoot, nullptr, IcoLib_GetIconHandle(ICO_POPUP_ON)); } else { - Menu_ModifyItem(hMenuItem, LPGENW("Enable popups"), IcoLib_GetIcon(ICO_POPUP_OFF)); - Menu_ModifyItem(hMenuRoot, nullptr, IcoLib_GetIcon(ICO_POPUP_OFF)); + Menu_ModifyItem(hMenuItem, LPGENW("Enable popups"), IcoLib_GetIconHandle(ICO_POPUP_OFF)); + Menu_ModifyItem(hMenuRoot, nullptr, IcoLib_GetIconHandle(ICO_POPUP_OFF)); } if (hTTButton) diff --git a/src/mir_app/src/menu_clist.cpp b/src/mir_app/src/menu_clist.cpp index 42f980f034..d06543f2d3 100644 --- a/src/mir_app/src/menu_clist.cpp +++ b/src/mir_app/src/menu_clist.cpp @@ -469,7 +469,6 @@ static INT_PTR StatusMenuCheckService(WPARAM wParam, LPARAM) pimi->mi.flags &= ~CMIF_CHECKED;
}
else if ((!smep || smep->szProto) && pimi->mi.name.a) {
- BOOL IconNeedDestroy = FALSE;
char* prot;
if (smep)
prot = smep->szProto;
@@ -484,21 +483,12 @@ static INT_PTR StatusMenuCheckService(WPARAM wParam, LPARAM) if (pa->iRealStatus >= ID_STATUS_OFFLINE && pa->iRealStatus < ID_STATUS_IDLE)
pimi->mi.hIcolibItem = Skin_LoadProtoIcon(prot, pa->iRealStatus);
- else {
- pimi->mi.hIcolibItem = (HICON)CallProtoServiceInt(0, prot, PS_LOADICON, PLI_PROTOCOL | PLIF_SMALL, 0);
- if (pimi->mi.hIcolibItem == (HICON)CALLSERVICE_NOTFOUND)
- pimi->mi.hIcolibItem = nullptr;
- else
- IconNeedDestroy = TRUE;
- }
+ else
+ pimi->mi.hIcolibItem = Skin_LoadProtoIcon(prot, ID_STATUS_ONLINE);
if (pimi->mi.hIcolibItem) {
Menu_ModifyItem(pimi, nullptr, pimi->mi.hIcolibItem);
- if (IconNeedDestroy) {
- DestroyIcon((HICON)pimi->mi.hIcolibItem);
- pimi->mi.hIcolibItem = nullptr;
- }
- else IcoLib_ReleaseIcon((HICON)pimi->mi.hIcolibItem);
+ IcoLib_ReleaseIcon((HICON)pimi->mi.hIcolibItem);
}
}
|