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 /protocols | |
| parent | 7e852468c6d1a45cd4c78c4744b74e51d29e26b0 (diff) | |
Menu_ModifyItem to receive icolib handle, not HICON
Diffstat (limited to 'protocols')
| -rw-r--r-- | protocols/ICQ-WIM/src/proto.cpp | 2 | ||||
| -rw-r--r-- | protocols/JabberG/src/jabber_menu.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/protocols/ICQ-WIM/src/proto.cpp b/protocols/ICQ-WIM/src/proto.cpp index 05574fef89..06e67ee280 100644 --- a/protocols/ICQ-WIM/src/proto.cpp +++ b/protocols/ICQ-WIM/src/proto.cpp @@ -204,7 +204,7 @@ INT_PTR CIcqProto::GotoInbox(WPARAM, LPARAM) int CIcqProto::OnContactMenu(WPARAM hContact, LPARAM) { Menu_ShowItem(g_plugin.m_hmiRoot, true); - Menu_ModifyItem(g_plugin.m_hmiRoot, nullptr, Skin_LoadProtoIcon(GetContactProto(hContact), ID_STATUS_ONLINE)); + Menu_ModifyItem(g_plugin.m_hmiRoot, nullptr, Skin_GetProtoIcon(GetContactProto(hContact), ID_STATUS_ONLINE)); bool bIgnorable = getDword(hContact, "ApparentMode") != ID_STATUS_OFFLINE; Menu_ShowItem(g_plugin.m_hmiAllow, !bIgnorable); diff --git a/protocols/JabberG/src/jabber_menu.cpp b/protocols/JabberG/src/jabber_menu.cpp index 22dd87b721..640315f3bb 100644 --- a/protocols/JabberG/src/jabber_menu.cpp +++ b/protocols/JabberG/src/jabber_menu.cpp @@ -318,7 +318,7 @@ int CJabberProto::OnPrebuildContactMenu(WPARAM hContact, LPARAM) Menu_ShowItem(g_hMenuDirectPresence[0], TRUE);
for (int i = 0; i < _countof(PresenceModeArray); i++)
- Menu_ModifyItem(g_hMenuDirectPresence[i + 1], nullptr, Skin_LoadProtoIcon(m_szModuleName, PresenceModeArray[i].mode));
+ Menu_ModifyItem(g_hMenuDirectPresence[i + 1], nullptr, Skin_GetProtoIcon(m_szModuleName, PresenceModeArray[i].mode));
if (bIsChatRoom) {
ptrA roomid(getUStringA(hContact, "ChatRoomID"));
@@ -1068,7 +1068,7 @@ CJabberProto* JabberChooseInstance(bool bIsLink) if (ppro->m_iStatus != ID_STATUS_OFFLINE && ppro->m_iStatus != ID_STATUS_CONNECTING) {
++nItems;
lastItemId = CMPlugin::g_arInstances.indexOf(&ppro) + 1;
- Menu_ModifyItem(ppro->m_hChooseMenuItem, nullptr, Skin_LoadProtoIcon(ppro->m_szModuleName, ppro->m_iStatus));
+ Menu_ModifyItem(ppro->m_hChooseMenuItem, nullptr, Skin_GetProtoIcon(ppro->m_szModuleName, ppro->m_iStatus));
}
else Menu_ShowItem(ppro->m_hChooseMenuItem, false);
}
|