From ab4abbb7a60f941acab8f0566c6b619f68f1b489 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sat, 27 Jun 2015 11:09:19 +0000 Subject: - CLISTMENUITEM::pszContactOwner removed, because it's supported only by contact's menu; - Menu_AddContactMenuItem now receives parameter szProto; - Menu_Add* helpers are converted into real functions; git-svn-id: http://svn.miranda-ng.org/main/trunk@14409 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/TabSRMM/src/globals.cpp | 10 +++++----- plugins/TabSRMM/src/typingnotify.cpp | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) (limited to 'plugins/TabSRMM/src') diff --git a/plugins/TabSRMM/src/globals.cpp b/plugins/TabSRMM/src/globals.cpp index 470ba6ec37..6098edf5c4 100644 --- a/plugins/TabSRMM/src/globals.cpp +++ b/plugins/TabSRMM/src/globals.cpp @@ -139,7 +139,7 @@ void CGlobals::reloadSystemModulesChanged() mi.position = -2000090000; mi.flags = CMIF_DEFAULT; mi.icolibItem = Skin_GetIconHandle(SKINICON_EVENT_MESSAGE); - mi.pszName = LPGEN("&Message"); + mi.name.a = LPGEN("&Message"); mi.pszService = MS_MSG_SENDMESSAGE; PluginConfig.m_hMenuItem = Menu_AddContactMenuItem(&mi); @@ -327,15 +327,15 @@ int CGlobals::ModulesLoaded(WPARAM, LPARAM) CLISTMENUITEM mi = { 0 }; mi.position = -500050005; - mi.hIcon = PluginConfig.g_iconContainer; - mi.pszName = LPGEN("&Messaging settings..."); + mi.icolibItem = PluginConfig.g_iconContainer; + mi.name.a = LPGEN("&Messaging settings..."); mi.pszService = MS_TABMSG_SETUSERPREFS; PluginConfig.m_UserMenuItem = Menu_AddContactMenuItem(&mi); if (sendLater->isAvail()) { mi.position = -500050006; - mi.hIcon = 0; - mi.pszName = LPGEN("&Send later job list..."); + mi.icolibItem = 0; + mi.name.a = LPGEN("&Send later job list..."); mi.pszService = MS_TABMSG_SLQMGR; PluginConfig.m_UserMenuItem = Menu_AddMainMenuItem(&mi); } diff --git a/plugins/TabSRMM/src/typingnotify.cpp b/plugins/TabSRMM/src/typingnotify.cpp index c1637a6f0f..e64e83ddee 100644 --- a/plugins/TabSRMM/src/typingnotify.cpp +++ b/plugins/TabSRMM/src/typingnotify.cpp @@ -538,12 +538,12 @@ int TN_ModuleInit() CLISTMENUITEM mi = { 0 }; if (!Disabled) { - mi.pszName = LPGEN("Disable &typing notification"); - mi.hIcon = LoadIcon(g_hInst, MAKEINTRESOURCE(IDI_ENABLED)); + mi.name.a = LPGEN("Disable &typing notification"); + mi.icolibItem = LoadIcon(g_hInst, MAKEINTRESOURCE(IDI_ENABLED)); } else { - mi.pszName = LPGEN("Enable &typing notification"); - mi.hIcon = LoadIcon(g_hInst, MAKEINTRESOURCE(IDI_DISABLED)); + mi.name.a = LPGEN("Enable &typing notification"); + mi.icolibItem = LoadIcon(g_hInst, MAKEINTRESOURCE(IDI_DISABLED)); } mi.pszService = "TypingNotify/EnableDisableMenuCommand"; mi.hParentMenu = Menu_CreateRoot(MO_MAIN, LPGENT("Popups"), 0); -- cgit v1.2.3