diff options
| -rw-r--r-- | plugins/Clist_modern/src/groupmenu.cpp | 9 | ||||
| -rw-r--r-- | src/mir_app/src/menu_groups.cpp | 8 |
2 files changed, 7 insertions, 10 deletions
diff --git a/plugins/Clist_modern/src/groupmenu.cpp b/plugins/Clist_modern/src/groupmenu.cpp index 36f7d3b617..4c166d0fa2 100644 --- a/plugins/Clist_modern/src/groupmenu.cpp +++ b/plugins/Clist_modern/src/groupmenu.cpp @@ -48,9 +48,9 @@ static int OnBuildSubGroupMenu(WPARAM wParam, LPARAM) return 0;
}
-static INT_PTR GroupMenuExecProxy(WPARAM wParam, LPARAM lParam)
+static INT_PTR GroupMenuExecProxy(WPARAM, LPARAM lParam)
{
- SendMessage(lParam ? (HWND)lParam : (HWND)g_clistApi.hwndContactTree, WM_COMMAND, wParam, 0);
+ SendMessage(g_clistApi.hwndContactTree, WM_COMMAND, lParam, 0);
return 0;
}
@@ -68,12 +68,13 @@ void InitGroupMenus(void) HookEvent(ME_CLIST_PREBUILDGROUPMENU, OnBuildSubGroupMenu);
// add exit command to menu
- GroupMenuParam gmp = { POPUP_GROUPSHOWOFFLINE, 0 };
+ GroupMenuParam gmp = { 0, POPUP_GROUPSHOWOFFLINE };
SET_UID(mi, 0x7E081A28, 0x19B3, 0x407F, 0x80, 0x6B, 0x70, 0xC3, 0xC3, 0xA9, 0xD2, 0xA4);
mi.position = 900001;
- mi.pszService = "Modern/GroupMenuExecProxy";
mi.name.a = LPGEN("&Show offline users in here");
+ mi.hIcolibItem = nullptr;
+ mi.pszService = "Modern/GroupMenuExecProxy";
hShowOfflineUsersHereMenuItem = Menu_AddGroupMenuItem(&mi, &gmp);
CreateServiceFunction(mi.pszService, GroupMenuExecProxy);
}
diff --git a/src/mir_app/src/menu_groups.cpp b/src/mir_app/src/menu_groups.cpp index a8dccf8e77..1a1eba0e3b 100644 --- a/src/mir_app/src/menu_groups.cpp +++ b/src/mir_app/src/menu_groups.cpp @@ -59,10 +59,8 @@ MIR_APP_DLL(HGENMENU) Menu_AddGroupMenuItem(TMO_MenuItem *pmi, GroupMenuParam *g // we need just one parametr.
mmep->szServiceName = mir_strdup(pmi->pszService);
- if (gmp != nullptr) {
- mmep->Param1 = gmp->wParam;
+ if (gmp != nullptr)
mmep->Param2 = gmp->lParam;
- }
HGENMENU hNewItem = Menu_AddItem(hGroupMenuObject, pmi, mmep);
@@ -80,10 +78,8 @@ static INT_PTR GroupMenuCheckService(WPARAM wParam, LPARAM) TCheckProcParam *CParam = (TCheckProcParam *)wParam;
if (CParam) {
GroupMenuExecParam *mmep = (GroupMenuExecParam *)(CParam->MenuItemOwnerData);
- if (mmep) {
+ if (mmep)
mmep->Param1 = CParam->wParam;
- mmep->Param2 = CParam->lParam;
- }
}
return 1;
}
|