diff options
| author | George Hazan <ghazan@miranda.im> | 2017-11-27 12:32:05 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2017-11-27 12:32:05 +0300 |
| commit | cc79c1d36c07b905f9d47e5002f90783de92e6cb (patch) | |
| tree | 7bbad4f326de511109e641fb652133cf970dd4c6 /plugins | |
| parent | 48affc01c9a19f3ce39a4600ec6b8e0b247b80c1 (diff) | |
slightly optimized way of getting menu item's module name
Diffstat (limited to 'plugins')
93 files changed, 2 insertions, 109 deletions
diff --git a/plugins/AddContactPlus/src/main.cpp b/plugins/AddContactPlus/src/main.cpp index 368c37c2b8..26df21c584 100644 --- a/plugins/AddContactPlus/src/main.cpp +++ b/plugins/AddContactPlus/src/main.cpp @@ -94,7 +94,6 @@ static int OnAccListChanged(WPARAM, LPARAM) CMenuItem mi;
SET_UID(mi, 0xb19db907, 0x870e, 0x49fa, 0xa7, 0x1e, 0x43, 0x5e, 0xa8, 0xe5, 0x9b, 0xbd);
- mi.Module = "AddContact+";
mi.position = 500020001;
mi.flags = CMIF_UNICODE;
mi.hIcolibItem = icon.hIcolib;
diff --git a/plugins/Alarms/src/frame.cpp b/plugins/Alarms/src/frame.cpp index 28252c7bfa..fcbc4d75e0 100755 --- a/plugins/Alarms/src/frame.cpp +++ b/plugins/Alarms/src/frame.cpp @@ -531,7 +531,6 @@ int CreateFrame() mi.name.a = LPGEN("Show reminders");
mi.pszService = MODULE "/ShowHideReminders";
mi.position = 500010000;
- mi.Module = MODULE;
hMenuShowReminders = Menu_AddMainMenuItem(&mi);
/////////////////////
diff --git a/plugins/Alarms/src/options.cpp b/plugins/Alarms/src/options.cpp index 87d0b35ee8..ec2a9a3467 100755 --- a/plugins/Alarms/src/options.cpp +++ b/plugins/Alarms/src/options.cpp @@ -823,7 +823,6 @@ void AddMenuItem() mi.name.a = "Set alarm";
mi.pszService = MODULE "/NewAlarm";
mi.position = 500010000;
- mi.Module = MODULE;
hMainMenuItem = Menu_AddMainMenuItem(&mi);
}
diff --git a/plugins/AuthState/src/main.cpp b/plugins/AuthState/src/main.cpp index b6ce411788..db2de1db13 100644 --- a/plugins/AuthState/src/main.cpp +++ b/plugins/AuthState/src/main.cpp @@ -183,7 +183,6 @@ extern "C" int __declspec(dllexport) Load(void) mi.flags = CMIF_UNICODE;
mi.name.w = LPGENW("Enable AuthState icons");
mi.pszService = "AuthState/MenuItem";
- mi.Module = MODULENAME;
hUserMenu = Menu_AddContactMenuItem(&mi);
// IcoLib support
diff --git a/plugins/AutoShutdown/src/settingsdlg.cpp b/plugins/AutoShutdown/src/settingsdlg.cpp index 5c7c38cc59..662196b3ca 100644 --- a/plugins/AutoShutdown/src/settingsdlg.cpp +++ b/plugins/AutoShutdown/src/settingsdlg.cpp @@ -440,7 +440,6 @@ void SetShutdownMenuItem(bool fActive) CMenuItem mi;
SET_UID(mi, 0x61e2a38f, 0xcd94, 0x4f72, 0x84, 0x8c, 0x72, 0x92, 0xde, 0x1d, 0x6d, 0x5);
mi.position = 2001090000;
- mi.Module = "AutoShutdown";
if (fActive) {
mi.hIcolibItem = iconList[1].hIcolib;
mi.name.w = LPGENW("Stop automatic &shutdown");
diff --git a/plugins/AvatarHistory/src/AvatarDlg.cpp b/plugins/AvatarHistory/src/AvatarDlg.cpp index c56c680e3b..a352efd61b 100644 --- a/plugins/AvatarHistory/src/AvatarDlg.cpp +++ b/plugins/AvatarHistory/src/AvatarDlg.cpp @@ -503,7 +503,6 @@ void InitMenuItem() mi.position = 1000090010;
mi.hIcolibItem = createDefaultOverlayedIcon(FALSE);
mi.pszService = MS_AVATARHISTORY_SHOWDIALOG;
- mi.Module = MODULE_NAME;
hMenu = Menu_AddContactMenuItem(&mi);
DestroyIcon((HICON)mi.hIcolibItem);
}
diff --git a/plugins/BasicHistory/src/BasicHistory.cpp b/plugins/BasicHistory/src/BasicHistory.cpp index 18b197f786..b017c33188 100644 --- a/plugins/BasicHistory/src/BasicHistory.cpp +++ b/plugins/BasicHistory/src/BasicHistory.cpp @@ -100,7 +100,6 @@ void InitMenuItems() SET_UID(mi, 0x28848d7a, 0x6995, 0x4799, 0x82, 0xd7, 0x18, 0x40, 0x3d, 0xe3, 0x71, 0xc4);
mi.position = 1000090000;
- mi.Module = MODULE;
mi.hIcolibItem = Skin_GetIconHandle(SKINICON_OTHER_HISTORY);
mi.name.a = LPGEN("View &History");
mi.pszService = MS_HISTORY_SHOWCONTACTHISTORY;
@@ -127,7 +126,6 @@ void InitTaskMenuItems() CMenuItem mi;
SET_UID(mi, 0xbf66499, 0x1b39, 0x47a2, 0x9b, 0x74, 0xa6, 0xae, 0x89, 0x95, 0x59, 0x59);
mi.position = 500060005;
- mi.Module = MODULE;
mi.hIcolibItem = Skin_GetIconHandle(SKINICON_OTHER_HISTORY);
mi.name.a = LPGEN("Execute history task");
hTaskMainMenu = Menu_AddMainMenuItem(&mi);
@@ -148,7 +146,6 @@ void InitTaskMenuItems() mi.pszService = MS_HISTORY_EXECUTE_TASK;
mi.root = hTaskMainMenu;
mi.name.w = (wchar_t*)taskIt->taskName.c_str();
- mi.Module = MODULE;
HGENMENU menu = Menu_AddMainMenuItem(&mi);
Menu_ConfigureItem(menu, MCI_OPT_EXECPARAM, pos++);
taskMenus.push_back(menu);
diff --git a/plugins/Boltun/src/boltun.cpp b/plugins/Boltun/src/boltun.cpp index 355aefb6b5..0c9e889d7b 100644 --- a/plugins/Boltun/src/boltun.cpp +++ b/plugins/Boltun/src/boltun.cpp @@ -548,7 +548,6 @@ extern "C" int __declspec(dllexport) Load(void) mi.position = -50010002; //TODO: check the warning
mi.name.a = BOLTUN_AUTO_CHAT;
mi.pszService = SERV_CONTACT_AUTO_CHAT;
- mi.Module = BOLTUN_NAME;
hMenuItemAutoChat = Menu_AddContactMenuItem(&mi);
SET_UID(mi, 0x726af984, 0x988c, 0x4d5d, 0x97, 0x30, 0xdc, 0x46, 0x55, 0x76, 0x1, 0x73);
diff --git a/plugins/BossKeyPlus/src/BossKey.cpp b/plugins/BossKeyPlus/src/BossKey.cpp index 9f357f2ea1..9d7df65878 100644 --- a/plugins/BossKeyPlus/src/BossKey.cpp +++ b/plugins/BossKeyPlus/src/BossKey.cpp @@ -536,7 +536,6 @@ void BossKeyMenuItemInit(void) // Add menu item mi.hIcolibItem = IcoLib_GetIcon("hidemim");
mi.name.w = LPGENW("Hide");
mi.pszService = MS_BOSSKEY_HIDE;
- mi.Module = MOD_NAME;
g_hMenuItem = Menu_AddMainMenuItem(&mi);
HookEvent(ME_CLIST_PREBUILDMAINMENU, GenMenuInit);
diff --git a/plugins/BuddyExpectator/src/BuddyExpectator.cpp b/plugins/BuddyExpectator/src/BuddyExpectator.cpp index 5db20f206b..d8b1ef3749 100644 --- a/plugins/BuddyExpectator/src/BuddyExpectator.cpp +++ b/plugins/BuddyExpectator/src/BuddyExpectator.cpp @@ -613,7 +613,6 @@ int ModulesLoaded(WPARAM, LPARAM) mi.position = 200000;
mi.name.w = LPGENW("Enable Miss You");
mi.pszService = "BuddyExpectator/actionMissYouClick";
- mi.Module = MODULE_NAME;
hContactMenu = Menu_AddContactMenuItem(&mi);
}
diff --git a/plugins/BuddyPounce/src/main.cpp b/plugins/BuddyPounce/src/main.cpp index df1be51572..250e76658f 100644 --- a/plugins/BuddyPounce/src/main.cpp +++ b/plugins/BuddyPounce/src/main.cpp @@ -50,7 +50,6 @@ int MainInit(WPARAM, LPARAM) mi.hIcolibItem = LoadIcon(hInst,MAKEINTRESOURCE(IDI_POUNCE));
mi.name.a = LPGEN("&Buddy Pounce");
mi.pszService = "BuddyPounce/MenuCommand";
- mi.Module = modname;
Menu_AddContactMenuItem(&mi);
return 0;
}
diff --git a/plugins/CSList/src/cslist.cpp b/plugins/CSList/src/cslist.cpp index 7543eb27d9..10cfefe065 100644 --- a/plugins/CSList/src/cslist.cpp +++ b/plugins/CSList/src/cslist.cpp @@ -244,7 +244,6 @@ void addProtoStatusMenuItem(char *protoName) mi.position = 2000040000; mi.pszService = buf; mi.root = hRoot; - mi.Module = MODNAME; Menu_AddStatusMenuItem(&mi); RegisterHotkeys(buf, pdescr->tszAccountName, pdescr->iOrder); diff --git a/plugins/ClientChangeNotify/src/ClientChangeNotify.cpp b/plugins/ClientChangeNotify/src/ClientChangeNotify.cpp index 342d8fed89..05a4423f30 100644 --- a/plugins/ClientChangeNotify/src/ClientChangeNotify.cpp +++ b/plugins/ClientChangeNotify/src/ClientChangeNotify.cpp @@ -339,7 +339,6 @@ int MirandaLoaded(WPARAM, LPARAM) mi.name.w = LPGENW("Enable c&lient change notification");
mi.pszService = MS_CCN_TOGGLEPOPUPS;
- mi.Module = MOD_NAME;
g_hTogglePopupsMenuItem = Menu_AddMainMenuItem(&mi);
}
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);
diff --git a/plugins/Clist_nicer/src/clistmenus.cpp b/plugins/Clist_nicer/src/clistmenus.cpp index a9cbc52167..0aef011081 100644 --- a/plugins/Clist_nicer/src/clistmenus.cpp +++ b/plugins/Clist_nicer/src/clistmenus.cpp @@ -371,7 +371,6 @@ int InitCustomMenus(void) mi.pszService = "CList/SetContactIgnore";
mi.hIcolibItem = iconItem[0].hIcolib;
mi.name.a = LPGEN("&Contact list settings...");
- mi.Module = "Clist_nicer";
Menu_AddContactMenuItem(&mi);
return 0;
}
diff --git a/plugins/Clist_nicer/src/cluiframes.cpp b/plugins/Clist_nicer/src/cluiframes.cpp index e8345ad2bc..0a2a2d1499 100644 --- a/plugins/Clist_nicer/src/cluiframes.cpp +++ b/plugins/Clist_nicer/src/cluiframes.cpp @@ -1350,7 +1350,6 @@ static int CLUIFramesLoadMainMenu() mi.position = separator; mi.name.w = F.TitleBar.tbname ? F.TitleBar.tbname : F.name; mi.pszService = nullptr; - mi.Module = "Clist_nicer"; g_frameMenus.insert(F.MenuHandles.MainMenuItem = Menu_AddMainMenuItem(&mi)); CLUIFramesCreateMenuForFrame(F.id, F.MenuHandles.MainMenuItem, separator, true); CLUIFramesModifyMainMenuItems(F.id, 0); @@ -2963,7 +2962,6 @@ int LoadCLUIFramesModule(void) mi.position = 3000090000; mi.name.a = LPGEN("Frames"); mi.pszService = nullptr; - mi.Module = "Clist_nicer"; cont.MainMenuItem = Menu_AddMainMenuItem(&mi); UNSET_UID(mi); diff --git a/plugins/Clist_nicer/src/groupmenu.cpp b/plugins/Clist_nicer/src/groupmenu.cpp index 1ee775fd69..62b955c8c7 100644 --- a/plugins/Clist_nicer/src/groupmenu.cpp +++ b/plugins/Clist_nicer/src/groupmenu.cpp @@ -102,7 +102,6 @@ void InitGroupMenus(void) mi.pszService = "Clist/ShowHide";
mi.hIcolibItem = Skin_GetIconHandle(SKINICON_OTHER_SHOWHIDE);
mi.name.a = LPGEN("&Hide/show");
- mi.Module = "Clist_nicer";
hHideShowMainMenuItem = Menu_AddGroupMenuItem(&mi);
SET_UID(mi, 0xb0f29663, 0x68b6, 0x494c, 0xaf, 0xab, 0xf6, 0x86, 0x45, 0xb8, 0xdb, 0xde);
diff --git a/plugins/CloudFile/src/menus.cpp b/plugins/CloudFile/src/menus.cpp index 9e18038d58..acfd469092 100644 --- a/plugins/CloudFile/src/menus.cpp +++ b/plugins/CloudFile/src/menus.cpp @@ -30,7 +30,6 @@ void InitializeMenus() mi.position = -2000019999; mi.hIcon = LoadIconEx(IDI_UPLOAD); - mi.Module = MODULE; hContactMenu = Menu_AddContactMenuItem(&mi); if (defaultService) diff --git a/plugins/Console/src/Console.cpp b/plugins/Console/src/Console.cpp index f55e201e74..43c85aea52 100644 --- a/plugins/Console/src/Console.cpp +++ b/plugins/Console/src/Console.cpp @@ -1150,7 +1150,6 @@ static int OnSystemModulesLoaded(WPARAM, LPARAM) mi.position = 1900000000;
mi.name.w = (IsWindowVisible(hwndConsole)) ? LPGENW("Hide Console") : LPGENW("Show Console");
mi.pszService = MS_CONSOLE_SHOW_HIDE;
- mi.Module = "Console";
hMenu = Menu_AddMainMenuItem(&mi);
OnFontChange(0, 0);
diff --git a/plugins/ContactsPlus/src/main.cpp b/plugins/ContactsPlus/src/main.cpp index 9c38b6dd34..66b604553d 100644 --- a/plugins/ContactsPlus/src/main.cpp +++ b/plugins/ContactsPlus/src/main.cpp @@ -141,7 +141,6 @@ static int HookModulesLoaded(WPARAM, LPARAM) mi.position = -2000009990; //position in menu
mi.pszService = MS_CONTACTS_SEND;
mi.hIcolibItem = LoadIcon(hInst, MAKEINTRESOURCE(IDI_CONTACTS));
- mi.Module = MODULENAME;
hContactMenuItem = Menu_AddContactMenuItem(&mi);
HookEvent(ME_CLIST_PREBUILDCONTACTMENU, HookPreBuildContactMenu);
diff --git a/plugins/CrashDumper/src/crshdmp.cpp b/plugins/CrashDumper/src/crshdmp.cpp index f634d5c3d5..f31de55e7c 100644 --- a/plugins/CrashDumper/src/crshdmp.cpp +++ b/plugins/CrashDumper/src/crshdmp.cpp @@ -264,7 +264,6 @@ static int ModulesLoaded(WPARAM, LPARAM) mi.name.a = LPGEN("Copy to clipboard");
mi.hIcolibItem = GetIconHandle(IDI_VITOCLIP);
mi.pszService = MS_CRASHDUMPER_STORETOCLIP;
- mi.Module = PluginName;
Menu_AddMainMenuItem(&mi);
SET_UID(mi, 0x54109094, 0x494e, 0x4535, 0x9c, 0x3a, 0xf6, 0x9e, 0x9a, 0xf7, 0xcd, 0xbe);
diff --git a/plugins/CyrTranslit/src/MirandaContact.cpp b/plugins/CyrTranslit/src/MirandaContact.cpp index 55041d0efe..173696bcbf 100644 --- a/plugins/CyrTranslit/src/MirandaContact.cpp +++ b/plugins/CyrTranslit/src/MirandaContact.cpp @@ -68,7 +68,6 @@ void MirandaContact::addMenuItem() mi.name.a = MENU_ITEM_TEXT;
mi.position = 65535;
mi.pszService = MENU_COMMAND_CALLBACK_SERVICE;
- mi.Module = SETTINGS_MODULE;
hTransliterateCmdMenuItem = Menu_AddContactMenuItem(&mi);
}
diff --git a/plugins/Db3x_mmap/src/ui.cpp b/plugins/Db3x_mmap/src/ui.cpp index 2c279f9c80..2e088b95d8 100644 --- a/plugins/Db3x_mmap/src/ui.cpp +++ b/plugins/Db3x_mmap/src/ui.cpp @@ -340,7 +340,6 @@ static int OnModulesLoaded(PVOID obj, WPARAM, LPARAM) mi.hIcolibItem = iconList[1].hIcolib;
mi.name.w = db->GetMenuTitle();
mi.pszService = MS_DB_CHANGEPASSWORD;
- mi.Module = "Dbx_mmap";
hSetPwdMenu = Menu_AddMainMenuItem(&mi);
return 0;
}
diff --git a/plugins/DbEditorPP/src/main.cpp b/plugins/DbEditorPP/src/main.cpp index 1fa1618db8..e3c6084450 100644 --- a/plugins/DbEditorPP/src/main.cpp +++ b/plugins/DbEditorPP/src/main.cpp @@ -120,7 +120,6 @@ int ModulesLoaded(WPARAM, LPARAM) mi.hIcolibItem = GetIcoLibHandle(ICO_DBE_BUTT);
mi.name.a = modFullname;
mi.pszService = "DBEditorpp/MenuCommand";
- mi.Module = modname;
Menu_AddMainMenuItem(&mi);
SET_UID(mi, 0x2fed8613, 0xac43, 0x4148, 0xbd, 0x5c, 0x44, 0x88, 0xaf, 0x68, 0x69, 0x10);
diff --git a/plugins/Db_autobackups/src/main.cpp b/plugins/Db_autobackups/src/main.cpp index 2c4d36f0c6..a0a2e37751 100644 --- a/plugins/Db_autobackups/src/main.cpp +++ b/plugins/Db_autobackups/src/main.cpp @@ -72,7 +72,6 @@ static int ModulesLoad(WPARAM, LPARAM) mi.pszService = MS_AB_BACKUP;
mi.hIcolibItem = iconList[0].hIcolib;
mi.position = 500100000;
- mi.Module = "AutoBackups";
Menu_AddMainMenuItem(&mi);
SET_UID(mi, 0x15e93f83, 0x930e, 0x4cf9, 0x91, 0x31, 0x4c, 0x2b, 0xb, 0xaa, 0xd2, 0x18);
diff --git a/plugins/Dropbox/src/dropbox_menus.cpp b/plugins/Dropbox/src/dropbox_menus.cpp index 65939434ab..1a96848edd 100644 --- a/plugins/Dropbox/src/dropbox_menus.cpp +++ b/plugins/Dropbox/src/dropbox_menus.cpp @@ -26,7 +26,6 @@ void CDropbox::InitializeMenus() mi.name.a = LPGEN("Upload files to Dropbox");
mi.position = -2000020000 + CMI_SEND_FILES;
mi.hIcolibItem = GetIconHandleByName("upload");
- mi.Module = MODULE;
contactMenuItems[CMI_SEND_FILES] = Menu_AddContactMenuItem(&mi);
CreateServiceFunctionObj(mi.pszService, SendFilesToDropboxCommand, this);
}
diff --git a/plugins/Exchange/src/hooked_events.cpp b/plugins/Exchange/src/hooked_events.cpp index cfcfa55c9c..fdb239a046 100644 --- a/plugins/Exchange/src/hooked_events.cpp +++ b/plugins/Exchange/src/hooked_events.cpp @@ -67,7 +67,6 @@ int OnModulesLoaded(WPARAM, LPARAM) mi.pszService = MS_EXCHANGE_CHECKEMAIL;
mi.flags = CMIF_UNICODE;
mi.name.w = LPGENW("Check exchange mailbox");
- mi.Module = ModuleName;
Menu_AddMainMenuItem(&mi);
hEmailsDlg = nullptr; //CreateDialog(hInstance, MAKEINTRESOURCE(IDD_EMAILS), NULL, DlgProcEmails); //create emails window
diff --git a/plugins/FTPFileYM/src/ftpfile.cpp b/plugins/FTPFileYM/src/ftpfile.cpp index 7827fb9f8e..bc4d4dc996 100644 --- a/plugins/FTPFileYM/src/ftpfile.cpp +++ b/plugins/FTPFileYM/src/ftpfile.cpp @@ -96,7 +96,6 @@ void InitMenuItems() mi.hIcolibItem = iconList[ServerList::FTP_COUNT].hIcolib;
mi.position = 3000090001;
mi.name.w = LPGENW("FTP File");
- mi.Module = MODULE;
hMainMenu = Menu_AddMainMenuItem(&mi);
if (opt.bUseSubmenu)
@@ -125,7 +124,6 @@ void InitMenuItems() mi2.root = hSubMenu[i];
mi2.pszService = MS_FTPFILE_CONTACTMENU;
mi2.name.w = LPGENW("Upload file(s)");
- mi2.Module = MODULE;
HGENMENU tmp = Menu_AddContactMenuItem(&mi2);
Menu_ConfigureItem(tmp, MCI_OPT_EXECPARAM, mi2.position = i + UploadJob::FTP_RAWFILE);
diff --git a/plugins/FileAsMessage/src/main.cpp b/plugins/FileAsMessage/src/main.cpp index 2ba39d1619..594e95e395 100644 --- a/plugins/FileAsMessage/src/main.cpp +++ b/plugins/FileAsMessage/src/main.cpp @@ -184,7 +184,6 @@ static int OnModulesLoaded(WPARAM, LPARAM) mi.name.a = LPGEN("File As Message...");
mi.pszService = SERVICE_NAME "/FESendFile";
mi.flags = CMIF_NOTOFFLINE;
- mi.Module = SERVICE_NAME;
Menu_AddContactMenuItem(&mi);
return 0;
}
diff --git a/plugins/FloatingContacts/src/main.cpp b/plugins/FloatingContacts/src/main.cpp index a7c1a72a04..d840c61e62 100644 --- a/plugins/FloatingContacts/src/main.cpp +++ b/plugins/FloatingContacts/src/main.cpp @@ -727,7 +727,6 @@ static void LoadMenus() mi.hIcolibItem = LoadIcon(hInst, MAKEINTRESOURCE(IDI_HIDE));
mi.name.w = LPGENW("Remove thumb");
mi.pszService = MODULE "/RemoveThumb";
- mi.Module = MODULE;
hMenuItemRemove = Menu_AddContactMenuItem(&mi);
// Hide all thumbs main menu item
diff --git a/plugins/GmailNotifier/src/main.cpp b/plugins/GmailNotifier/src/main.cpp index e0f98c2383..ff6946fadc 100644 --- a/plugins/GmailNotifier/src/main.cpp +++ b/plugins/GmailNotifier/src/main.cpp @@ -149,7 +149,6 @@ extern "C" int __declspec(dllexport) Load() mi.hIcolibItem = Skin_LoadProtoIcon(MODULE_NAME, ID_STATUS_ONLINE);
mi.name.a = LPGEN("&Check all Gmail inboxes");
mi.pszService = MODULE_NAME "/MenuCommand";
- mi.Module = MODULE_NAME;
Menu_AddMainMenuItem(&mi);
SET_UID(mi, 0x22c6ace1, 0xba0c, 0x44b5, 0xa4, 0xd2, 0x1, 0x7d, 0xb1, 0xe0, 0x51, 0xeb);
diff --git a/plugins/HTTPServer/src/GuiElements.cpp b/plugins/HTTPServer/src/GuiElements.cpp index 0dffe76acd..5e1134b2c9 100644 --- a/plugins/HTTPServer/src/GuiElements.cpp +++ b/plugins/HTTPServer/src/GuiElements.cpp @@ -1480,7 +1480,6 @@ void InitGuiElements() mi.position = -2000019955;
mi.name.w = LPGENW("HTTP Share new file");
mi.pszService = MS_SHARE_NEW_FILE;
- mi.Module = MODULE;
hShareNewFileMenuItem = Menu_AddContactMenuItem(&mi);
if (db_get_b(NULL, MODULE, "AddStatisticsMenuItem", 1) != 0) {
diff --git a/plugins/HTTPServer/src/main.cpp b/plugins/HTTPServer/src/main.cpp index 4c8ba27c82..fb821023f6 100644 --- a/plugins/HTTPServer/src/main.cpp +++ b/plugins/HTTPServer/src/main.cpp @@ -926,7 +926,6 @@ extern "C" __declspec(dllexport) int Load() mi.position = 1000085000;
mi.name.a = LPGEN("Enable HTTP server");
mi.pszService = MS_HTTP_ACCEPT_CONNECTIONS;
- mi.Module = MODULE;
hAcceptConnectionsMenuItem = Menu_AddMainMenuItem(&mi);
}
diff --git a/plugins/HistoryLinkListPlus/src/linklist.cpp b/plugins/HistoryLinkListPlus/src/linklist.cpp index 2e411f451d..3c8a94d11a 100644 --- a/plugins/HistoryLinkListPlus/src/linklist.cpp +++ b/plugins/HistoryLinkListPlus/src/linklist.cpp @@ -58,7 +58,6 @@ extern "C" __declspec(dllexport) int Load(void) mi.hIcolibItem = LoadIcon(hInst, MAKEINTRESOURCE(IDI_LINKLISTICON));
mi.name.w = LPGENW("&Create Linklist");
mi.pszService = "Linklist/MenuCommand";
- mi.Module = LINKLIST_MODULE;
Menu_AddContactMenuItem(&mi);
hWindowList = WindowList_Create();
diff --git a/plugins/HistoryPlusPlus/historypp.dpr b/plugins/HistoryPlusPlus/historypp.dpr index 81ed90ce33..7a5a4dbd09 100644 --- a/plugins/HistoryPlusPlus/historypp.dpr +++ b/plugins/HistoryPlusPlus/historypp.dpr @@ -250,7 +250,6 @@ begin menuItem.szName.w := MenuHandles[miContact].Name;
menuItem.pszService := MS_HISTORY_SHOWCONTACTHISTORY;
menuItem.hIcon := hppIcons[HPP_ICON_CONTACTHISTORY].handle;
- menuItem.Module := 'HistoryPlusPlus';
MenuHandles[miContact].Handle := Menu_AddContactMenuItem(@menuItem);
// create empty item in contact menu
diff --git a/plugins/HistoryStats/src/mu_common.cpp b/plugins/HistoryStats/src/mu_common.cpp index 50e05d5dcf..212485233a 100644 --- a/plugins/HistoryStats/src/mu_common.cpp +++ b/plugins/HistoryStats/src/mu_common.cpp @@ -25,7 +25,6 @@ namespace mu mi.hIcolibItem = hIcon;
mi.pszService = const_cast<char*>(pszService);
mi.root = hRoot;
- mi.Module = "HistoryStats";
mi.uid = menu_id; menu_id.d[7]++;
return Menu_AddMainMenuItem(&mi);
}
@@ -39,7 +38,6 @@ namespace mu mi.position = position;
mi.hIcolibItem = hIcon;
mi.pszService = const_cast<char*>(pszService);
- mi.Module = "HistoryStats";
mi.uid = menu_id; menu_id.d[7]++;
return Menu_AddContactMenuItem(&mi);
}
diff --git a/plugins/IEHistory/src/IEHistory.cpp b/plugins/IEHistory/src/IEHistory.cpp index d30cd7c705..2096b2d701 100644 --- a/plugins/IEHistory/src/IEHistory.cpp +++ b/plugins/IEHistory/src/IEHistory.cpp @@ -82,7 +82,6 @@ extern "C" int __declspec(dllexport) Load(void) mi.position = 1000090000; mi.hIcolibItem = hIcon; mi.pszService = MS_HISTORY_SHOWCONTACTHISTORY; - mi.Module = ModuleName; Menu_AddContactMenuItem(&mi); /// @todo (White-Tiger#1#08/19/14): fully implement System History someday^^ diff --git a/plugins/Import/src/main.cpp b/plugins/Import/src/main.cpp index b092bfe0a3..33ae9d1494 100644 --- a/plugins/Import/src/main.cpp +++ b/plugins/Import/src/main.cpp @@ -126,7 +126,6 @@ extern "C" __declspec(dllexport) int Load(void) mi.name.a = LPGEN("&Import...");
mi.position = 500050000;
mi.pszService = IMPORT_SERVICE;
- mi.Module = IMPORT_MODULE;
Menu_AddMainMenuItem(&mi);
HookEvent(ME_SYSTEM_MODULESLOADED, ModulesLoaded);
diff --git a/plugins/ImportTXT/importtxt.dpr b/plugins/ImportTXT/importtxt.dpr index bb344db8ca..5c5d635e0b 100644 --- a/plugins/ImportTXT/importtxt.dpr +++ b/plugins/ImportTXT/importtxt.dpr @@ -135,7 +135,6 @@ begin mi.hIcon := LoadIcon(hInstance, MAKEINTRESOURCE(IDI_DEFAULT));
mi.szName.a := 'Import history';
mi.pszService := IMPORT_TXT_SERVICE;
- mi.Module := IMPORT_TXT_MODULE;
Menu_AddContacTMenuItem(@mi);
SET_UID(@mi, '0610209E-5BE0-4D57-AAE8-E1CCF1FB78B8');
diff --git a/plugins/ListeningTo/src/listeningto.cpp b/plugins/ListeningTo/src/listeningto.cpp index 28865dfe1c..ad77475d8a 100644 --- a/plugins/ListeningTo/src/listeningto.cpp +++ b/plugins/ListeningTo/src/listeningto.cpp @@ -104,7 +104,6 @@ void RebuildMenu() | (ListeningToEnabled(info->proto, TRUE) ? CMIF_CHECKED : 0)
| (opts.enable_sending ? 0 : CMIF_GRAYED);
- mi.Module = MODULE_NAME;
info->hMenu = Menu_AddMainMenuItem(&mi);
Menu_ConfigureItem(info->hMenu, MCI_OPT_EXECPARAM, i);
}
@@ -199,7 +198,6 @@ int ModulesLoaded(WPARAM, LPARAM) mi.name.w = LPGENW("Listening to");
mi.flags = CMIF_UNICODE;
mi.hIcolibItem = iconList[0].hIcolib;
- mi.Module = MODULE_NAME;
hMainMenuGroup = Menu_AddMainMenuItem(&mi);
mi.root = hMainMenuGroup;
@@ -213,7 +211,6 @@ int ModulesLoaded(WPARAM, LPARAM) mi.flags = CMIF_UNICODE
| (ListeningToEnabled(nullptr, true) ? CMIF_CHECKED : 0)
| (opts.enable_sending ? 0 : CMIF_GRAYED);
- mi.Module = MODULE_NAME;
proto_items.resize(1);
proto_items[0].hMenu = Menu_AddMainMenuItem(&mi);
proto_items[0].proto[0] = 0;
diff --git a/plugins/LotusNotify/src/LotusNotify.cpp b/plugins/LotusNotify/src/LotusNotify.cpp index 7cb72764e1..e76912891c 100644 --- a/plugins/LotusNotify/src/LotusNotify.cpp +++ b/plugins/LotusNotify/src/LotusNotify.cpp @@ -1704,7 +1704,6 @@ extern "C" int __declspec(dllexport) Load(void) mi.hIcolibItem = LoadIcon(hInst, MAKEINTRESOURCE(IDI_ICON1));
mi.name.w = LPGENW("&Check Lotus");
mi.pszService = "LotusNotify/MenuCommand"; //service name thet listning for menu call
- mi.Module = PLUGINNAME;
hMenuHandle = Menu_AddMainMenuItem(&mi); //create menu pos.
Menu_EnableItem(hMenuHandle, FALSE);
diff --git a/plugins/MenuItemEx/src/main.cpp b/plugins/MenuItemEx/src/main.cpp index f3dce36bdb..4a2ba849e7 100644 --- a/plugins/MenuItemEx/src/main.cpp +++ b/plugins/MenuItemEx/src/main.cpp @@ -741,7 +741,6 @@ static HGENMENU AddSubmenuItem(HGENMENU hRoot, wchar_t* name, HICON icon, DWORD mi.hIcolibItem = icon;
mi.flags = CMIF_UNICODE | CMIF_UNMOVABLE | flag;
mi.pszService = service;
- mi.Module = MODULENAME;
HGENMENU res = Menu_AddContactMenuItem(&mi);
Menu_ConfigureItem(res, MCI_OPT_EXECPARAM, param);
@@ -948,7 +947,6 @@ static int PluginInit(WPARAM, LPARAM) mi.position = 120000;
mi.name.w = LPGENW("Always visible");
mi.pszService = MS_SETVIS;
- mi.Module = MODULENAME;
hmenuVis = Menu_AddContactMenuItem(&mi);
SET_UID(mi, 0x7d93de78, 0xb1c, 0x4c51, 0x8c, 0x88, 0x33, 0x72, 0x12, 0xb5, 0xb8, 0xe7);
diff --git a/plugins/MirOTR/src/mirotrmenu.cpp b/plugins/MirOTR/src/mirotrmenu.cpp index 6ecb8d9593..21ae10a7f9 100644 --- a/plugins/MirOTR/src/mirotrmenu.cpp +++ b/plugins/MirOTR/src/mirotrmenu.cpp @@ -170,7 +170,6 @@ void InitMirOTRMenu(void) mi.flags = CMIF_DISABLED | CMIF_UNICODE; mi.name.w = LPGENW("OTR Status"); mi.position = 0; - mi.Module = MODULENAME; hStatusInfoItem = AddMirOTRMenuItem(&mi, nullptr); mi.flags = CMIF_UNICODE | CMIF_NOTPRIVATE | CMIF_NOTUNVERIFIED; diff --git a/plugins/MirOTR/src/svcs_menu.cpp b/plugins/MirOTR/src/svcs_menu.cpp index 65606d84ce..5b9d4703d7 100644 --- a/plugins/MirOTR/src/svcs_menu.cpp +++ b/plugins/MirOTR/src/svcs_menu.cpp @@ -161,7 +161,6 @@ void InitMenu() CMenuItem mi; mi.flags = CMIF_NOTOFFLINE | CMIF_UNICODE; mi.position = -400000; - mi.Module = MODULENAME; SET_UID(mi, 0xAB574FAD, 0x15D8, 0x49FF, 0xB7, 0x03, 0xDA, 0x2B, 0x45, 0x46, 0xC3, 0x56); mi.name.w = _A2W(LANG_STOP_OTR); diff --git a/plugins/Msg_Export/src/main.cpp b/plugins/Msg_Export/src/main.cpp index c48abefec2..e4b7fcaf51 100755 --- a/plugins/Msg_Export/src/main.cpp +++ b/plugins/Msg_Export/src/main.cpp @@ -119,7 +119,6 @@ int MainInit(WPARAM /*wparam*/, LPARAM /*lparam*/) mi.position = 1000090100;
mi.name.a = LPGEN("Open E&xported History");
mi.pszService = MS_SHOW_EXPORT_HISTORY;
- mi.Module = MODULE;
Menu_AddContactMenuItem(&mi);
}
diff --git a/plugins/MyDetails/src/frame.cpp b/plugins/MyDetails/src/frame.cpp index ba74454749..14b878a9b5 100644 --- a/plugins/MyDetails/src/frame.cpp +++ b/plugins/MyDetails/src/frame.cpp @@ -337,7 +337,6 @@ int CreateFrame() mi.hIcolibItem = Skin_LoadIcon(SKINICON_OTHER_USERDETAILS);
mi.name.w = LPGENW("Show my details");
mi.pszService = MODULE_NAME"/ShowHideMyDetails";
- mi.Module = MODULE_NAME;
hMenuShowHideFrame = Menu_AddMainMenuItem(&mi);
Menu_ConfigureItem(hMenuShowHideFrame, MCI_OPT_EXECPARAM, -0x7FFFFFFF);
diff --git a/plugins/MyDetails/src/mydetails.cpp b/plugins/MyDetails/src/mydetails.cpp index 5a71480877..459ee0572d 100644 --- a/plugins/MyDetails/src/mydetails.cpp +++ b/plugins/MyDetails/src/mydetails.cpp @@ -93,7 +93,6 @@ static int MainInit(WPARAM, LPARAM) mi.flags = CMIF_UNICODE;
mi.hIcolibItem = Skin_GetIconHandle(SKINICON_OTHER_USERDETAILS);
mi.name.w = LPGENW("My details");
- mi.Module = MODULE_NAME;
HGENMENU hMenuRoot = Menu_AddMainMenuItem(&mi);
mi.flags = CMIF_UNICODE;
diff --git a/plugins/NewAwaySysMod/src/AwaySys.cpp b/plugins/NewAwaySysMod/src/AwaySys.cpp index 1e3f9e43b6..4ab5f98280 100644 --- a/plugins/NewAwaySysMod/src/AwaySys.cpp +++ b/plugins/NewAwaySysMod/src/AwaySys.cpp @@ -635,7 +635,6 @@ int MirandaLoaded(WPARAM, LPARAM) mi.hIcolibItem = iconList[SendOnEvent ? 1 : 0].hIcolib;
mi.name.w = SendOnEvent ? DISABLE_SOE_COMMAND : ENABLE_SOE_COMMAND;
mi.pszService = MS_AWAYSYS_AUTOREPLY_TOGGLE;
- mi.Module = MOD_NAME;
g_hToggleSOEMenuItem = Menu_AddMainMenuItem(&mi);
memset(&mi, 0, sizeof(mi));
diff --git a/plugins/NewEventNotify/src/menuitem.cpp b/plugins/NewEventNotify/src/menuitem.cpp index 6486014db2..63be89ce14 100644 --- a/plugins/NewEventNotify/src/menuitem.cpp +++ b/plugins/NewEventNotify/src/menuitem.cpp @@ -59,7 +59,6 @@ int MenuitemInit(BOOL bStatus) mi.hIcolibItem = LoadIcon(g_hInst, MAKEINTRESOURCE(IDI_ENABLED));
mi.pszService = MS_NEN_MENUNOTIFY;
mi.flags = 0;
- mi.Module = MODULE;
hMenuitemNotify = Menu_AddMainMenuItem(&mi);
bNotify = bStatus;
diff --git a/plugins/NewXstatusNotify/src/main.cpp b/plugins/NewXstatusNotify/src/main.cpp index 8ac084d704..eea1cf800f 100644 --- a/plugins/NewXstatusNotify/src/main.cpp +++ b/plugins/NewXstatusNotify/src/main.cpp @@ -1074,7 +1074,6 @@ void InitMainMenuItem() if (ServiceExists(MS_POPUP_ADDPOPUPT))
mi.root = Menu_CreateRoot(MO_MAIN, LPGENW("Popups"), 0);
mi.pszService = MS_STATUSCHANGE_MENUCOMMAND;
- mi.Module = MODULE;
hEnableDisableMenu = Menu_AddMainMenuItem(&mi);
opt.TempDisabled = !opt.TempDisabled;
diff --git a/plugins/New_GPG/src/init.cpp b/plugins/New_GPG/src/init.cpp index 9314e73174..27bfb72b0f 100644 --- a/plugins/New_GPG/src/init.cpp +++ b/plugins/New_GPG/src/init.cpp @@ -187,7 +187,6 @@ extern "C" int __declspec(dllexport) Load() mi.hIcolibItem = Skin_LoadIcon(SKINICON_OTHER_MIRANDA);
mi.name.w = LPGENW("Load public GPG key");
mi.pszService = "/LoadPubKey";
- mi.Module = szGPGModuleName;
hLoadPubKey = Menu_AddContactMenuItem(&mi);
SET_UID(mi, 0xc8008193, 0x56a9, 0x414a, 0x82, 0x98, 0x78, 0xe8, 0xa8, 0x84, 0x20, 0x67);
diff --git a/plugins/NewsAggregator/Src/Menus.cpp b/plugins/NewsAggregator/Src/Menus.cpp index 0897f93008..73128cf5be 100644 --- a/plugins/NewsAggregator/Src/Menus.cpp +++ b/plugins/NewsAggregator/Src/Menus.cpp @@ -25,7 +25,6 @@ void InitMenu() {
CMenuItem mi;
mi.flags = CMIF_UNICODE | CMIF_NOTOFFLINE;
- mi.Module = MODULE;
mi.root = Menu_CreateRoot(MO_MAIN, LPGENW("News Aggregator"), 500099000);
Menu_ConfigureItem(mi.root, MCI_OPT_UID, "D9733E4F-1946-4390-8EB3-591E8687222E");
diff --git a/plugins/NoHistory/src/dllmain.cpp b/plugins/NoHistory/src/dllmain.cpp index 2e5a27d902..f20a68161b 100644 --- a/plugins/NoHistory/src/dllmain.cpp +++ b/plugins/NoHistory/src/dllmain.cpp @@ -252,7 +252,6 @@ int ModulesLoaded(WPARAM, LPARAM) mi.name.w = LPGENW("Disable History");
mi.pszService = MS_NOHISTORY_TOGGLE;
mi.hIcolibItem = hIconRemove;
- mi.Module = MODULE;
hMenuToggle = Menu_AddContactMenuItem(&mi);
SET_UID(mi, 0x1c4b1c21, 0xc0d1, 0x44d1, 0xb5, 0x3c, 0xc7, 0x8d, 0xcf, 0x96, 0x51, 0xd7);
diff --git a/plugins/Non-IM Contact/src/main.cpp b/plugins/Non-IM Contact/src/main.cpp index 7023450286..5f7f769469 100644 --- a/plugins/Non-IM Contact/src/main.cpp +++ b/plugins/Non-IM Contact/src/main.cpp @@ -152,7 +152,6 @@ extern "C" __declspec(dllexport) int Load() mi.name.a = LPGEN("&Add Non-IM Contact");
mi.pszService = "AddLCcontact";
mi.hIcolibItem = icoList[0].hIcolib;
- mi.Module = MODNAME;
Menu_AddMainMenuItem(&mi);
SET_UID(mi, 0xa511c5e, 0x26d2, 0x41b1, 0xbd, 0xb7, 0x3e, 0x62, 0xc8, 0x44, 0x37, 0xc9);
diff --git a/plugins/NotesAndReminders/src/main.cpp b/plugins/NotesAndReminders/src/main.cpp index 52909e7961..0ea7fd65e3 100644 --- a/plugins/NotesAndReminders/src/main.cpp +++ b/plugins/NotesAndReminders/src/main.cpp @@ -203,7 +203,6 @@ int OnModulesLoaded(WPARAM, LPARAM) mi.hIcolibItem = iconList[2].hIcolib;
mi.name.w = LPGENW("New &Note");
mi.pszService = MODULENAME"/MenuCommandAddNew";
- mi.Module = MODULENAME;
addMenuItem(mi);
mi.position = 1600000001;
diff --git a/plugins/Nudge/src/main.cpp b/plugins/Nudge/src/main.cpp index 582167ab13..990546769b 100644 --- a/plugins/Nudge/src/main.cpp +++ b/plugins/Nudge/src/main.cpp @@ -344,7 +344,6 @@ extern "C" int __declspec(dllexport) Load(void) mi.hIcolibItem = iconList[0].hIcolib;
mi.name.w = LPGENW("Send &nudge");
mi.pszService = MS_NUDGE_SEND;
- mi.Module = MODULENAME;
g_hContactMenu = Menu_AddContactMenuItem(&mi);
// register special type of event
diff --git a/plugins/OpenFolder/src/openFolder.cpp b/plugins/OpenFolder/src/openFolder.cpp index b07baea84e..97509a117b 100644 --- a/plugins/OpenFolder/src/openFolder.cpp +++ b/plugins/OpenFolder/src/openFolder.cpp @@ -103,7 +103,6 @@ extern "C" int __declspec(dllexport) Load() mi.hIcolibItem = icon.hIcolib;
mi.name.w = LPGENW("Open Folder");
mi.pszService = MS_OPENFOLDER_OPEN;
- mi.Module = OPENFOLDER_MODULE_NAME;
Menu_AddMainMenuItem(&mi);
return 0;
diff --git a/plugins/PackUpdater/Src/PackUpdater.cpp b/plugins/PackUpdater/Src/PackUpdater.cpp index 4dc8088b16..2d889f6911 100644 --- a/plugins/PackUpdater/Src/PackUpdater.cpp +++ b/plugins/PackUpdater/Src/PackUpdater.cpp @@ -77,8 +77,8 @@ extern "C" __declspec(dllexport) int Load(void) mi.hIcolibItem = IcoLib_GetIcon("check_update");
mi.name.w = LPGENW("Check for pack updates");
mi.pszService = MODNAME"/CheckUpdates";
- mi.Module = MODNAME;
Menu_AddMainMenuItem(&mi);
+
// Add empty updates folder menu item
CreateServiceFunction(MODNAME"/EmptyFolder", EmptyFolder);
memset(&mi, 0, sizeof(mi));
diff --git a/plugins/PasteIt/src/PasteIt.cpp b/plugins/PasteIt/src/PasteIt.cpp index fece91b1b8..96de6b8a51 100644 --- a/plugins/PasteIt/src/PasteIt.cpp +++ b/plugins/PasteIt/src/PasteIt.cpp @@ -289,7 +289,6 @@ void InitMenuItems() mi.hIcolibItem = icon.hIcolib;
mi.position = 3000090005;
mi.name.w = LPGENW("Paste It");
- mi.Module = MODULE;
hContactMenu = Menu_AddContactMenuItem(&mi);
memset(&mi, 0, sizeof(mi));
@@ -312,7 +311,6 @@ void InitMenuItems() CMenuItem mi2;
mi2.pszService = MS_PASTEIT_CONTACTMENU;
mi2.root = hDefWebMenu;
- mi2.Module = MODULE;
for (int i = 0; i < PasteToWeb::pages; ++i)
{
mi2.flags = CMIF_UNICODE | CMIF_UNMOVABLE;
diff --git a/plugins/Ping/src/menu.cpp b/plugins/Ping/src/menu.cpp index dda8287e46..3f2a0bd198 100644 --- a/plugins/Ping/src/menu.cpp +++ b/plugins/Ping/src/menu.cpp @@ -16,7 +16,6 @@ void InitMenus() mi.hIcolibItem = hIconResponding;
mi.name.w = LPGENW("Enable all pings");
mi.pszService = PLUG "/EnableAll";
- mi.Module = PLUG;
Menu_AddMainMenuItem(&mi);
SET_UID(mi, 0x1dac6ea6, 0x116e, 0x41a3, 0xa6, 0xe8, 0x42, 0xdf, 0xf7, 0x27, 0xc4, 0x7c);
diff --git a/plugins/Ping/src/pingthread.cpp b/plugins/Ping/src/pingthread.cpp index 388aaa2291..1cc8632675 100644 --- a/plugins/Ping/src/pingthread.cpp +++ b/plugins/Ping/src/pingthread.cpp @@ -896,7 +896,6 @@ void InitList() mi.position = 3000320001;
mi.name.w = LPGENW("Show/Hide &Ping Window");
mi.pszService = PLUG "/ShowWindow";
- mi.Module = PLUG;
Menu_AddMainMenuItem(&mi);
if (options.attach_to_clist) AttachToClist(true);
diff --git a/plugins/PluginUpdater/src/PluginUpdater.cpp b/plugins/PluginUpdater/src/PluginUpdater.cpp index 2cc9490322..863a93ac7b 100644 --- a/plugins/PluginUpdater/src/PluginUpdater.cpp +++ b/plugins/PluginUpdater/src/PluginUpdater.cpp @@ -90,7 +90,6 @@ extern "C" __declspec(dllexport) int Load(void) SET_UID(mi, 0xfa2cbe01, 0x3b37, 0x4a4c, 0xa6, 0x97, 0xe4, 0x6f, 0x31, 0xa9, 0xfc, 0x33);
mi.name.a = LPGEN("Check for updates");
mi.hIcolibItem = iconList[0].hIcolib;
- mi.Module = MODULEA;
#else
CLISTMENUITEM mi = { 0 };
mi.cbSize = sizeof(mi);
diff --git a/plugins/Popup/src/main.cpp b/plugins/Popup/src/main.cpp index 78790ef51c..7471eddb29 100644 --- a/plugins/Popup/src/main.cpp +++ b/plugins/Popup/src/main.cpp @@ -175,7 +175,6 @@ void InitMenuItems(void) {
CMenuItem mi;
mi.flags = CMIF_UNICODE;
- mi.Module = MODULNAME_PLU;
HANDLE hIcon = GetIconHandle(PopupOptions.ModuleIsEnabled ? IDI_POPUP : IDI_NOPOPUP);
diff --git a/plugins/ProfileManager/src/pmanagerEx.cpp b/plugins/ProfileManager/src/pmanagerEx.cpp index dbd500bf60..4b221431e1 100644 --- a/plugins/ProfileManager/src/pmanagerEx.cpp +++ b/plugins/ProfileManager/src/pmanagerEx.cpp @@ -113,7 +113,6 @@ extern "C" __declspec(dllexport) int Load(void) CMenuItem mi;
mi.root = Menu_CreateRoot(MO_MAIN, LPGENW("Database"), -500200000);
- mi.Module = "Profile manager";
for (int i = 0; i < _countof(iconList); i++) {
mi.name.a = iconList[i].szDescr;
diff --git a/plugins/QuickContacts/src/quickcontacts.cpp b/plugins/QuickContacts/src/quickcontacts.cpp index 26e7ffbdcc..75034af9ca 100644 --- a/plugins/QuickContacts/src/quickcontacts.cpp +++ b/plugins/QuickContacts/src/quickcontacts.cpp @@ -188,7 +188,6 @@ int ModulesLoaded(WPARAM, LPARAM) mi.flags = CMIF_UNICODE;
mi.name.w = LPGENW("Quick Contacts...");
mi.pszService = MS_QC_SHOW_DIALOG;
- mi.Module = MODULE_NAME;
Menu_AddMainMenuItem(&mi);
return 0;
}
diff --git a/plugins/QuickSearch/sr_global.pas b/plugins/QuickSearch/sr_global.pas index b54dc76401..1490c52eea 100644 --- a/plugins/QuickSearch/sr_global.pas +++ b/plugins/QuickSearch/sr_global.pas @@ -240,8 +240,7 @@ begin mi.position :=500050000;
mi.pszService :=QS_SHOWSERVICE;
mi.hIcon :=IcoLib_GetIcon(QS_QS,0);
- mi.Module :=qs_module;
- MainMenuItem :=Menu_AddMainMenuItem(@mi);
+ MainMenuItem :=Menu_AddMainMenuItem(@mi);
end;
// -------- column functions ---------
diff --git a/plugins/QuickSearch/sr_window.pas b/plugins/QuickSearch/sr_window.pas index cdd7673e3d..e1d44f8e11 100644 --- a/plugins/QuickSearch/sr_window.pas +++ b/plugins/QuickSearch/sr_window.pas @@ -816,7 +816,6 @@ begin mi.flags :=CMIF_UNICODE;
mi.szName.w :='Change setting through QS';
mi.pszService:='QS/dummy';
- mi.Module:=qs_module;
mnuhandle:=Menu_AddContactMenuItem(@mi);
end
else
diff --git a/plugins/Quotes/src/Forex.cpp b/plugins/Quotes/src/Forex.cpp index a6314860f5..0a56404ca4 100644 --- a/plugins/Quotes/src/Forex.cpp +++ b/plugins/Quotes/src/Forex.cpp @@ -78,7 +78,6 @@ void InitMenu() {
CMenuItem mi;
mi.flags = CMIF_UNICODE;
- mi.Module = QUOTES_PROTOCOL_NAME;
mi.root = Menu_CreateRoot(MO_MAIN, LPGENW("Quotes"), 0, Quotes_GetIconHandle(IDI_ICON_MAIN));
Menu_ConfigureItem(mi.root, MCI_OPT_UID, "B474F556-22B6-42A1-A91E-22FE4F671388");
diff --git a/plugins/RecentContacts/src/RecentContacts.cpp b/plugins/RecentContacts/src/RecentContacts.cpp index c79483b967..0ed7142472 100644 --- a/plugins/RecentContacts/src/RecentContacts.cpp +++ b/plugins/RecentContacts/src/RecentContacts.cpp @@ -455,7 +455,6 @@ int Create_MenuitemShowList(void) mi.hIcolibItem = icon.hIcolib;
mi.name.a = LPGEN("Recent Contacts");
mi.pszService = msLastUC_ShowList;
- mi.Module = MODULENAME;
Menu_AddMainMenuItem(&mi);
SET_UID(mi, 0xe22ce213, 0x362a, 0x444a, 0xa5, 0x82, 0xc, 0xcf, 0xf5, 0x4b, 0xd1, 0x8e);
diff --git a/plugins/RemovePersonalSettings/src/rps.cpp b/plugins/RemovePersonalSettings/src/rps.cpp index 5af1a4d4a7..0f792822c0 100644 --- a/plugins/RemovePersonalSettings/src/rps.cpp +++ b/plugins/RemovePersonalSettings/src/rps.cpp @@ -99,7 +99,6 @@ extern "C" int __declspec(dllexport) Load() mi.hIcolibItem = Skin_LoadIcon(SKINICON_OTHER_MIRANDA);
mi.name.a = LPGEN("Remove Personal Settings...");
mi.pszService="RemovePersonalSettings/RemoveAll";
- mi.Module = "RemovePersonalSettings";
Menu_AddMainMenuItem(&mi);
CreateServiceFunction(mi.pszService, RemoveAllService);
diff --git a/plugins/Restart/src/restart.cpp b/plugins/Restart/src/restart.cpp index 1658e55a21..7f2ad366ac 100644 --- a/plugins/Restart/src/restart.cpp +++ b/plugins/Restart/src/restart.cpp @@ -52,7 +52,6 @@ extern "C" __declspec(dllexport) int Load(void) mi.hIcolibItem = icon.hIcolib;
mi.name.a = LPGEN("Restart");
mi.pszService = "System/RestartMe";
- mi.Module = "Restart";
Menu_AddMainMenuItem(&mi);
Menu_AddTrayMenuItem(&mi);
return 0;
diff --git a/plugins/SMS/src/SMS_svc.cpp b/plugins/SMS/src/SMS_svc.cpp index 54b10e4ce5..330c089f08 100644 --- a/plugins/SMS/src/SMS_svc.cpp +++ b/plugins/SMS/src/SMS_svc.cpp @@ -35,7 +35,6 @@ int LoadModules(void) mi.name.w = SMS_SEND_STR;
mi.pszService = szServiceFunction;
mi.flags = CMIF_UNICODE;
- mi.Module = PROTOCOL_NAMEA;
Menu_AddMainMenuItem(&mi);
SET_UID(mi, 0x736e4cff, 0x769e, 0x45dc, 0x8b, 0x78, 0x83, 0xf9, 0xe4, 0xbb, 0x81, 0x9e);
diff --git a/plugins/Scriver/src/msgs.cpp b/plugins/Scriver/src/msgs.cpp index b4e0fb00ea..d7c0f1ac32 100644 --- a/plugins/Scriver/src/msgs.cpp +++ b/plugins/Scriver/src/msgs.cpp @@ -577,7 +577,6 @@ static int OnModulesLoaded(WPARAM, LPARAM) mi.hIcolibItem = Skin_GetIconHandle(SKINICON_EVENT_MESSAGE);
mi.name.a = LPGEN("&Message");
mi.pszService = MS_MSG_SENDMESSAGE;
- mi.Module = "Scriver";
hMsgMenuItem = Menu_AddContactMenuItem(&mi);
IcoLib_ReleaseIcon((HICON)mi.hIcolibItem);
diff --git a/plugins/SecureIM/src/main.cpp b/plugins/SecureIM/src/main.cpp index 2b026a2bd5..a56200fff4 100644 --- a/plugins/SecureIM/src/main.cpp +++ b/plugins/SecureIM/src/main.cpp @@ -45,7 +45,6 @@ static HGENMENU MyAddMenuItem(LPCWSTR name, int pos, LPCSTR szUid, HICON hicon, mi.hIcolibItem = hicon;
mi.name.w = (wchar_t*)name;
mi.pszService = (char*)service;
- mi.Module = MODULENAME;
HGENMENU res = Menu_AddContactMenuItem(&mi);
Menu_ConfigureItem(res, MCI_OPT_UID, szUid);
return res;
@@ -59,7 +58,6 @@ static HGENMENU MyAddSubItem(HGENMENU hRoot, LPCSTR name, int pos, int poppos, L mi.name.a = (char*)name;
mi.root = hRoot;
mi.pszService = (char*)service;
- mi.Module = MODULENAME;
HGENMENU res = Menu_AddContactMenuItem(&mi);
Menu_ConfigureItem(res, MCI_OPT_EXECPARAM, poppos);
return res;
diff --git a/plugins/SeenPlugin/src/menu.cpp b/plugins/SeenPlugin/src/menu.cpp index 9b70a349d6..4a385b67d6 100644 --- a/plugins/SeenPlugin/src/menu.cpp +++ b/plugins/SeenPlugin/src/menu.cpp @@ -74,7 +74,6 @@ void InitMenuitem() mi.position = -0x7FFFFFFF;
mi.name.a = LPGEN("Last seen");
mi.pszService = "LastSeenUserDetails";
- mi.Module = S_MOD;
hmenuitem = Menu_AddContactMenuItem(&mi);
HookEvent(ME_CLIST_PREBUILDCONTACTMENU, BuildContactMenu);
diff --git a/plugins/SendScreenshotPlus/src/Main.cpp b/plugins/SendScreenshotPlus/src/Main.cpp index 0aa23e45fe..6710d8e16e 100644 --- a/plugins/SendScreenshotPlus/src/Main.cpp +++ b/plugins/SendScreenshotPlus/src/Main.cpp @@ -297,7 +297,6 @@ DLL_EXPORT int Load(void) CMenuItem mi; mi.flags = CMIF_UNICODE; mi.hIcolibItem = GetIconHandle(ICO_MAINXS); - mi.Module = SZ_SENDSS; SET_UID(mi, 0xa559a22e, 0xd0f9, 0x4553, 0x8e, 0x68, 0x55, 0xb3, 0xae, 0xc4, 0x5d, 0x93); mi.name.w = LPGENW("Take a screenshot"); diff --git a/plugins/Sessions/Src/Main.cpp b/plugins/Sessions/Src/Main.cpp index ad1829e390..6a365b73dc 100644 --- a/plugins/Sessions/Src/Main.cpp +++ b/plugins/Sessions/Src/Main.cpp @@ -769,7 +769,6 @@ static int PluginInit(WPARAM, LPARAM) // Main menu
CMenuItem mi;
mi.position = 1000000000;
- mi.Module = MODNAME;
mi.root = Menu_CreateRoot(MO_MAIN, LPGENW("Sessions Manager"), 1000000000);
Menu_ConfigureItem(mi.root, MCI_OPT_UID, "D77B9AB4-AF7E-43DB-A487-BD581704D635");
diff --git a/plugins/SimpleAR/src/Main.cpp b/plugins/SimpleAR/src/Main.cpp index 51c45bc482..8feceb95bf 100644 --- a/plugins/SimpleAR/src/Main.cpp +++ b/plugins/SimpleAR/src/Main.cpp @@ -253,7 +253,6 @@ extern "C" int __declspec(dllexport)Load(void) CreateServiceFunction(protocolname"/ToggleAutoanswer", Toggle);
CMenuItem mi;
- mi.Module = protocolname;
SET_UID(mi, 0xac1c64a, 0x82ca, 0x4845, 0x86, 0x89, 0x59, 0x76, 0x12, 0x74, 0x72, 0x7b);
mi.position = 500090000;
diff --git a/plugins/SimpleStatusMsg/src/awaymsg.cpp b/plugins/SimpleStatusMsg/src/awaymsg.cpp index 31f5c1d4d5..37ae062f63 100644 --- a/plugins/SimpleStatusMsg/src/awaymsg.cpp +++ b/plugins/SimpleStatusMsg/src/awaymsg.cpp @@ -384,7 +384,6 @@ int LoadAwayMsgModule(void) CMenuItem mi;
mi.flags = CMIF_UNICODE;
- mi.Module = "SimpleStatusMsg";
SET_UID(mi, 0xd3282acc, 0x9ff1, 0x4ede, 0x8a, 0x1e, 0x36, 0x72, 0x3f, 0x44, 0x4f, 0x84);
CreateServiceFunction(MS_AWAYMSG_SHOWAWAYMSG, GetMessageCommand);
diff --git a/plugins/SimpleStatusMsg/src/main.cpp b/plugins/SimpleStatusMsg/src/main.cpp index 293071bf04..f1fc07fed6 100644 --- a/plugins/SimpleStatusMsg/src/main.cpp +++ b/plugins/SimpleStatusMsg/src/main.cpp @@ -1383,7 +1383,6 @@ static int ChangeStatusMsgPrebuild(WPARAM, LPARAM) CMenuItem mi;
mi.flags = CMIF_UNICODE;
- mi.Module = "SimpleStatusMsg";
if (!db_get_b(NULL, "SimpleStatusMsg", "ShowStatusMenuItem", 1))
mi.flags |= CMIF_HIDDEN;
mi.hIcolibItem = GetIconHandle(IDI_CSMSG);
diff --git a/plugins/SmileyAdd/src/main.cpp b/plugins/SmileyAdd/src/main.cpp index 93379d5623..81c3c9bb19 100644 --- a/plugins/SmileyAdd/src/main.cpp +++ b/plugins/SmileyAdd/src/main.cpp @@ -57,7 +57,6 @@ static int ModulesLoaded(WPARAM, LPARAM) mi.position = 2000070050;
mi.hIcolibItem = icon.hIcolib;
mi.name.a = LPGEN("Assign smiley category");
- mi.Module = MODULENAME;
hContactMenuItem = Menu_AddContactMenuItem(&mi);
DownloadInit();
diff --git a/plugins/SmileyAdd/src/services.cpp b/plugins/SmileyAdd/src/services.cpp index a53351122f..c4583145d3 100644 --- a/plugins/SmileyAdd/src/services.cpp +++ b/plugins/SmileyAdd/src/services.cpp @@ -291,7 +291,6 @@ int RebuildContactMenu(WPARAM wParam, LPARAM) mi.root = hContactMenuItem;
mi.flags = CMIF_UNICODE | CMIF_SYSTEM;
mi.pszService = MS_SMILEYADD_CUSTOMCATMENU;
- mi.Module = MODULENAME;
bool nonecheck = true;
HGENMENU hMenu;
diff --git a/plugins/StartupSilence/src/main.cpp b/plugins/StartupSilence/src/main.cpp index eb663d5959..86b7295749 100644 --- a/plugins/StartupSilence/src/main.cpp +++ b/plugins/StartupSilence/src/main.cpp @@ -294,7 +294,6 @@ static INT_PTR InitMenu() mi.hIcolibItem = GetIconHandle(MENU_NAME);
mi.name.a = MENU_NAME;
mi.pszService = SS_SERVICE_NAME;
- mi.Module = MODULE_NAME;
hSSMenuToggleOnOff = Menu_AddMainMenuItem(&mi);
UpdateMenu();
return 0;
diff --git a/plugins/StatusManager/src/StartupStatus/ss_profiles.cpp b/plugins/StatusManager/src/StartupStatus/ss_profiles.cpp index 83281e9b75..d90a5a890b 100644 --- a/plugins/StatusManager/src/StartupStatus/ss_profiles.cpp +++ b/plugins/StatusManager/src/StartupStatus/ss_profiles.cpp @@ -55,7 +55,6 @@ static int CreateMainMenuItems(WPARAM, LPARAM) CMenuItem mi; mi.position = 2000100000; mi.flags = CMIF_UNICODE; - mi.Module = SSMODULENAME; mcount = 0; int count = GetProfileCount(0, 0); for (int i = 0; i < count && mcount < MAX_MMITEMS; i++) { diff --git a/plugins/StopSpamMod/src/init.cpp b/plugins/StopSpamMod/src/init.cpp index 4582dc0a2c..62e09e121f 100755 --- a/plugins/StopSpamMod/src/init.cpp +++ b/plugins/StopSpamMod/src/init.cpp @@ -157,8 +157,6 @@ extern "C" int __declspec(dllexport) Load() mi.hIcolibItem = Skin_LoadIcon(SKINICON_OTHER_MIRANDA);
mi.name.a = LPGEN("Remove Temporary Contacts");
mi.pszService = "/RemoveTmp";
- mi.Module = pluginName;
-
Menu_AddMainMenuItem(&mi);
return 0;
diff --git a/plugins/StopSpamPlus/src/stopspam.cpp b/plugins/StopSpamPlus/src/stopspam.cpp index 631d2c39c5..3409b6d8e8 100644 --- a/plugins/StopSpamPlus/src/stopspam.cpp +++ b/plugins/StopSpamPlus/src/stopspam.cpp @@ -59,7 +59,6 @@ extern "C" int __declspec(dllexport) Load(void) mi.hIcolibItem = Skin_LoadIcon(SKINICON_OTHER_MIRANDA);
mi.name.w = LPGENW("Remove Temporary Contacts");
mi.pszService = pluginName"/RemoveTempContacts";
- mi.Module = pluginName;
Menu_AddMainMenuItem(&mi);
return 0;
diff --git a/plugins/TabSRMM/src/globals.cpp b/plugins/TabSRMM/src/globals.cpp index 2dd65a150d..a002a44042 100644 --- a/plugins/TabSRMM/src/globals.cpp +++ b/plugins/TabSRMM/src/globals.cpp @@ -124,7 +124,6 @@ void CGlobals::reloadSystemModulesChanged() mi.hIcolibItem = Skin_GetIconHandle(SKINICON_EVENT_MESSAGE);
mi.name.a = LPGEN("&Message");
mi.pszService = MS_MSG_SENDMESSAGE;
- mi.Module = "TabSRMM";
PluginConfig.m_hMenuItem = Menu_AddContactMenuItem(&mi);
m_useAeroPeek = M.GetByte("useAeroPeek", 1);
@@ -312,7 +311,6 @@ int CGlobals::ModulesLoaded(WPARAM, LPARAM) mi.hIcolibItem = PluginConfig.g_iconContainer;
mi.name.a = LPGEN("&Messaging settings...");
mi.pszService = MS_TABMSG_SETUSERPREFS;
- mi.Module = "TabSRMM";
PluginConfig.m_UserMenuItem = Menu_AddContactMenuItem(&mi);
if (sendLater->isAvail()) {
diff --git a/plugins/TabSRMM/src/typingnotify.cpp b/plugins/TabSRMM/src/typingnotify.cpp index 8e3c4cce61..148505f51b 100644 --- a/plugins/TabSRMM/src/typingnotify.cpp +++ b/plugins/TabSRMM/src/typingnotify.cpp @@ -543,7 +543,6 @@ int TN_ModuleInit() }
mi.pszService = "TypingNotify/EnableDisableMenuCommand";
mi.root = Menu_CreateRoot(MO_MAIN, LPGENW("Popups"), 0);
- mi.Module = "TabSRMM";
hDisableMenu = Menu_AddMainMenuItem(&mi);
}
diff --git a/plugins/mRadio/i_tray.inc b/plugins/mRadio/i_tray.inc index 3967e32f0e..ff8b76a585 100644 --- a/plugins/mRadio/i_tray.inc +++ b/plugins/mRadio/i_tray.inc @@ -101,7 +101,6 @@ begin mi.position :=i;
mi.pszService:=@buf;
mi.szName.w :=tmp.name;
- mi.Module :=cPluginName;
tmp.menuitem:=Menu_AddTrayMenuItem(@mi);
end;
end;
@@ -137,7 +136,6 @@ begin mi.flags :=CMIF_UNICODE;
mi.szName.w:=cPluginName;
mi.hIcon :=IcoLib_GetIcon(IcoBtnSettings,0);
- mi.MOdule :=cPluginName;
trayradioparent:=Menu_AddTrayMenuItem(@mi);
FillChar(mi, sizeof(mi), 0);
diff --git a/plugins/mRadio/i_visual.inc b/plugins/mRadio/i_visual.inc index 9d7cd58f06..2f95f0daa2 100644 --- a/plugins/mRadio/i_visual.inc +++ b/plugins/mRadio/i_visual.inc @@ -36,7 +36,6 @@ begin SET_UID(@mi, 'DA1F1DA5-0C78-4FD5-B705-5F2C22EBDAD4');
mi.pszService:=MS_RADIO_RECORD;
mi.szName.a :='Start/Stop Record';
- mi.Module :=cPluginName;
hCMenuItemRec:=Menu_AddContactMenuItem(@mi);
SET_UID(@mi, '03C42002-709A-48CA-A9AF-450BEBDBE3E0');
|