From cc79c1d36c07b905f9d47e5002f90783de92e6cb Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 27 Nov 2017 12:32:05 +0300 Subject: slightly optimized way of getting menu item's module name --- plugins/Clist_modern/src/cluiframes.cpp | 2 -- plugins/Clist_modern/src/groupmenu.cpp | 2 -- plugins/Clist_modern/src/modern_clistmenus.cpp | 1 - plugins/Clist_modern/src/modern_clui.cpp | 1 - 4 files changed, 6 deletions(-) (limited to 'plugins/Clist_modern/src') diff --git a/plugins/Clist_modern/src/cluiframes.cpp b/plugins/Clist_modern/src/cluiframes.cpp index ad492e83d9..f5e130c5e7 100644 --- a/plugins/Clist_modern/src/cluiframes.cpp +++ b/plugins/Clist_modern/src/cluiframes.cpp @@ -1495,7 +1495,6 @@ static int CLUIFramesLoadMainMenu() mi.position = separator++; mi.name.w = F.TitleBar.tbname ? F.TitleBar.tbname : F.name; mi.pszService = nullptr; - mi.Module = "Clist_modern"; g_frameMenus.insert(F.MenuHandles.MainMenuItem = Menu_AddMainMenuItem(&mi)); CLUIFramesCreateMenuForFrame(F.id, F.MenuHandles.MainMenuItem, separator, true); CLUIFramesModifyMainMenuItems(F.id, 0); @@ -3333,7 +3332,6 @@ int LoadCLUIFramesModule(void) mi.hIcolibItem = Skin_GetIconHandle(SKINICON_OTHER_FRAME); mi.position = 3000090000; mi.name.a = LPGEN("Frames"); - mi.Module = "Clist_modern"; cont.MainMenuItem = Menu_AddMainMenuItem(&mi); UNSET_UID(mi); diff --git a/plugins/Clist_modern/src/groupmenu.cpp b/plugins/Clist_modern/src/groupmenu.cpp index c6bde070fa..3f1cc65679 100644 --- a/plugins/Clist_modern/src/groupmenu.cpp +++ b/plugins/Clist_modern/src/groupmenu.cpp @@ -63,7 +63,6 @@ void InitGroupMenus(void) mi.pszService = "Clist/ShowHide"; mi.hIcolibItem = Skin_GetIconHandle(SKINICON_OTHER_SHOWHIDE); mi.name.a = LPGEN("&Hide/show"); - mi.Module = "Clist_modern"; Menu_AddGroupMenuItem(&mi); SET_UID(mi, 0xb0f29663, 0x68b6, 0x494c, 0xaf, 0xab, 0xf6, 0x86, 0x45, 0xb8, 0xdb, 0xde); @@ -138,6 +137,5 @@ void InitSubGroupMenus(void) mi.position = 1002; mi.pszService = "CLISTMENUSSubGroup/GroupMenuExecProxy"; mi.name.a = LPGEN("&Show offline users in here"); - mi.Module = "Clist_modern"; hShowOfflineUsersHereMenuItem = Menu_AddSubGroupMenuItem(&mi, &gmp); } diff --git a/plugins/Clist_modern/src/modern_clistmenus.cpp b/plugins/Clist_modern/src/modern_clistmenus.cpp index 56e95f8ebf..4148a30712 100644 --- a/plugins/Clist_modern/src/modern_clistmenus.cpp +++ b/plugins/Clist_modern/src/modern_clistmenus.cpp @@ -128,7 +128,6 @@ int LoadFavoriteContactMenu() SET_UID(mi, 0xf99a2320, 0xc024, 0x48bd, 0x81, 0xf7, 0x9f, 0xa2, 0x5, 0xb0, 0x7f, 0xdc); mi.name.w = FAVMENUROOTNAME; mi.flags = CMIF_UNICODE; - mi.Module = "Clist_modern"; hFavoriteContactMenu = Menu_AddContactMenuItem(&mi); Menu_ConfigureItem(hFavoriteContactMenu, MCI_OPT_UNIQUENAME, "ModernClistMenu_ContactRate"); diff --git a/plugins/Clist_modern/src/modern_clui.cpp b/plugins/Clist_modern/src/modern_clui.cpp index ef66617cb9..521f49d15d 100644 --- a/plugins/Clist_modern/src/modern_clui.cpp +++ b/plugins/Clist_modern/src/modern_clui.cpp @@ -332,7 +332,6 @@ HRESULT CLUI::RegisterAvatarMenu() mi.hIcolibItem = iconItem[0].hIcolib; mi.name.a = LPGEN("Show contact &avatar"); mi.pszService = "CList/ShowContactAvatar"; - mi.Module = "Clist_modern"; hShowAvatarMenuItem = Menu_AddContactMenuItem(&mi); SET_UID(mi, 0x13f93d1b, 0xd470, 0x45de, 0x86, 0x8f, 0x22, 0x3b, 0x89, 0x4f, 0x4f, 0xa3); -- cgit v1.2.3