summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/delphi/m_genmenu.inc9
-rw-r--r--include/m_genmenu.h10
-rw-r--r--plugins/MenuItemEx/src/main.cpp2
-rw-r--r--plugins/Quotes/src/Forex.cpp2
-rw-r--r--plugins/SmileyAdd/src/services.cpp4
-rw-r--r--plugins/UserInfoEx/src/svc_email.cpp2
-rw-r--r--protocols/AimOscar/src/theme.cpp8
-rw-r--r--protocols/FacebookRM/src/theme.cpp2
-rw-r--r--protocols/Gadu-Gadu/src/gg.cpp2
-rw-r--r--protocols/Gadu-Gadu/src/image.cpp2
-rw-r--r--protocols/IRCG/src/services.cpp9
-rw-r--r--protocols/IcqOscarJ/src/icq_menu.cpp12
-rw-r--r--protocols/JabberG/src/jabber_menu.cpp18
-rw-r--r--protocols/MSN/src/msn_menu.cpp10
-rw-r--r--protocols/Sametime/src/conference.cpp4
-rw-r--r--protocols/Sametime/src/sametime_session.cpp2
-rw-r--r--protocols/Tlen/src/tlen.cpp11
-rw-r--r--protocols/Twitter/src/theme.cpp2
-rw-r--r--protocols/VKontakte/src/vk_proto.cpp2
-rw-r--r--protocols/Yahoo/src/services.cpp2
-rw-r--r--src/modules/clist/clistmenus.cpp7
-rw-r--r--src/modules/clist/movetogroup.cpp2
22 files changed, 50 insertions, 74 deletions
diff --git a/include/delphi/m_genmenu.inc b/include/delphi/m_genmenu.inc
index 685b20d512..252f1acc73 100644
--- a/include/delphi/m_genmenu.inc
+++ b/include/delphi/m_genmenu.inc
@@ -67,7 +67,6 @@ plugin may add different menu items with some service.
25-11-2002 Full support of runtime build of all menus.
Contact MS_CLIST_ADDCONTACTMENUITEM
- MS_CLIST_REMOVECONTACTMENUITEM
MS_CLIST_MENUBUILDCONTACT
ME_CLIST_PREBUILDCONTACTMENU
@@ -224,14 +223,6 @@ const
}
ME_CLIST_PREBUILDMAINMENU:PAnsiChar = 'CList/PreBuildMainMenu';
-{
- remove a item from contact menu
- wParam=hMenuItem returned by MS_CLIST_ADDCONTACTMENUITEM
- lParam=0
- returns 0 on success, nonzero on failure
-}
- MS_CLIST_REMOVECONTACTMENUITEM:PAnsiChar = 'CList/RemoveContactMenuItem';
-
// GENMENU_MODULE
SETTING_NOOFFLINEBOTTOM_DEFAULT = 0;
diff --git a/include/m_genmenu.h b/include/m_genmenu.h
index 90aa7c7eb9..ed7896aaf6 100644
--- a/include/m_genmenu.h
+++ b/include/m_genmenu.h
@@ -76,7 +76,6 @@ plugin may add different menu items with some service.
25-11-2002 Full support of runtime build of all menus.
Contact MS_CLIST_ADDCONTACTMENUITEM
- MS_CLIST_REMOVECONTACTMENUITEM
MS_CLIST_MENUBUILDCONTACT
ME_CLIST_PREBUILDCONTACTMENU
@@ -198,20 +197,11 @@ __forceinline HGENMENU Menu_AddTrayMenuItem(CLISTMENUITEM *mi)
//returns a HMENU identifying the menu.
#define MS_CLIST_MENUBUILDMAIN "CList/MenuBuildMain"
-
-
//the main menu is about to be built
//wParam=lParam=0
#define ME_CLIST_PREBUILDMAINMENU "CList/PreBuildMainMenu"
-
-
-//remove a item from contact menu
-//wParam=hMenuItem returned by MS_CLIST_ADDCONTACTMENUITEM
-//lParam=0
-//returns 0 on success, nonzero on failure
-#define MS_CLIST_REMOVECONTACTMENUITEM "CList/RemoveContactMenuItem"
/*GENMENU_MODULE*/
#define SETTING_NOOFFLINEBOTTOM_DEFAULT 0
diff --git a/plugins/MenuItemEx/src/main.cpp b/plugins/MenuItemEx/src/main.cpp
index 648037ea64..4382ca23ea 100644
--- a/plugins/MenuItemEx/src/main.cpp
+++ b/plugins/MenuItemEx/src/main.cpp
@@ -893,7 +893,7 @@ int EnumProtoSubmenu(WPARAM wparam, LPARAM lparam)
{
if (hProtoItem[i])
{
- CallService(MS_CLIST_REMOVECONTACTMENUITEM, (WPARAM)hProtoItem[i], 0);
+ CallService(MO_REMOVEMENUITEM, (WPARAM)hProtoItem[i], 0);
hProtoItem[i] = 0;
}
}
diff --git a/plugins/Quotes/src/Forex.cpp b/plugins/Quotes/src/Forex.cpp
index e03f8fccd9..888b8dc3fa 100644
--- a/plugins/Quotes/src/Forex.cpp
+++ b/plugins/Quotes/src/Forex.cpp
@@ -444,7 +444,7 @@ namespace
inline int Quotes_RemoveMenuItem(HGENMENU h)
{
- return CallService(MS_CLIST_REMOVECONTACTMENUITEM,reinterpret_cast<WPARAM>(h),0);
+ return CallService(MO_REMOVEMENUITEM, reinterpret_cast<WPARAM>(h), 0);
}
}
diff --git a/plugins/SmileyAdd/src/services.cpp b/plugins/SmileyAdd/src/services.cpp
index 0a591ae1ab..904da99971 100644
--- a/plugins/SmileyAdd/src/services.cpp
+++ b/plugins/SmileyAdd/src/services.cpp
@@ -254,7 +254,7 @@ INT_PTR CustomCatMenu(WPARAM hContact, LPARAM lParam)
}
for (int i=0; i < menuHandleArray.getCount(); i++)
- CallService(MS_CLIST_REMOVECONTACTMENUITEM, (WPARAM)menuHandleArray[i], 0);
+ CallService(MO_REMOVEMENUITEM, (WPARAM)menuHandleArray[i], 0);
menuHandleArray.destroy();
return TRUE;
@@ -277,7 +277,7 @@ int RebuildContactMenu(WPARAM wParam, LPARAM)
Menu_ShowItem(hContactMenuItem, haveMenu);
for (int i=0; i < menuHandleArray.getCount(); i++)
- CallService(MS_CLIST_REMOVECONTACTMENUITEM, (WPARAM)menuHandleArray[i], 0);
+ CallService(MO_REMOVEMENUITEM, (WPARAM)menuHandleArray[i], 0);
menuHandleArray.destroy();
if (haveMenu) {
diff --git a/plugins/UserInfoEx/src/svc_email.cpp b/plugins/UserInfoEx/src/svc_email.cpp
index 1b6430df86..dec21cfcf4 100644
--- a/plugins/UserInfoEx/src/svc_email.cpp
+++ b/plugins/UserInfoEx/src/svc_email.cpp
@@ -196,7 +196,7 @@ void SvcEMailRebuildMenu()
UnhookEvent(ME_CLIST_PREBUILDCONTACTMENU), hPrebuildMenuHook = NULL;
if (ghMenuItem) {
- CallService(MS_CLIST_REMOVECONTACTMENUITEM, (WPARAM)ghMenuItem, NULL);
+ CallService(MO_REMOVEMENUITEM, (WPARAM)ghMenuItem, NULL);
ghMenuItem = NULL;
}
}
diff --git a/protocols/AimOscar/src/theme.cpp b/protocols/AimOscar/src/theme.cpp
index b3470d8ec9..1710d8b2b2 100644
--- a/protocols/AimOscar/src/theme.cpp
+++ b/protocols/AimOscar/src/theme.cpp
@@ -317,8 +317,8 @@ void CAimProto::RemoveMainMenus(void)
void CAimProto::RemoveContactMenus(void)
{
- CallService(MS_CLIST_REMOVECONTACTMENUITEM, (WPARAM)hHTMLAwayContextMenuItem, 0);
- CallService(MS_CLIST_REMOVECONTACTMENUITEM, (WPARAM)hReadProfileMenuItem, 0);
- CallService(MS_CLIST_REMOVECONTACTMENUITEM, (WPARAM)hAddToServerListContextMenuItem, 0);
- CallService(MS_CLIST_REMOVECONTACTMENUITEM, (WPARAM)hBlockContextMenuItem, 0);
+ CallService(MO_REMOVEMENUITEM, (WPARAM)hHTMLAwayContextMenuItem, 0);
+ CallService(MO_REMOVEMENUITEM, (WPARAM)hReadProfileMenuItem, 0);
+ CallService(MO_REMOVEMENUITEM, (WPARAM)hAddToServerListContextMenuItem, 0);
+ CallService(MO_REMOVEMENUITEM, (WPARAM)hBlockContextMenuItem, 0);
}
diff --git a/protocols/FacebookRM/src/theme.cpp b/protocols/FacebookRM/src/theme.cpp
index c92e1541bc..64d5cc9f6e 100644
--- a/protocols/FacebookRM/src/theme.cpp
+++ b/protocols/FacebookRM/src/theme.cpp
@@ -164,7 +164,7 @@ void InitContactMenus()
void UninitContactMenus()
{
for(size_t i=0; i<SIZEOF(g_hContactMenuItems); i++)
- CallService(MS_CLIST_REMOVECONTACTMENUITEM,(WPARAM)g_hContactMenuItems[i],0);
+ CallService(MO_REMOVEMENUITEM, (WPARAM)g_hContactMenuItems[i], 0);
}
int FacebookProto::OnPrebuildContactMenu(WPARAM wParam,LPARAM lParam)
diff --git a/protocols/Gadu-Gadu/src/gg.cpp b/protocols/Gadu-Gadu/src/gg.cpp
index 6cdb929f0f..e1b9f75a61 100644
--- a/protocols/Gadu-Gadu/src/gg.cpp
+++ b/protocols/Gadu-Gadu/src/gg.cpp
@@ -264,7 +264,7 @@ void GGPROTO::block_init()
void GGPROTO::block_uninit()
{
- CallService(MS_CLIST_REMOVECONTACTMENUITEM, (WPARAM)hBlockMenuItem, 0);
+ CallService(MO_REMOVEMENUITEM, (WPARAM)hBlockMenuItem, 0);
}
//////////////////////////////////////////////////////////
diff --git a/protocols/Gadu-Gadu/src/image.cpp b/protocols/Gadu-Gadu/src/image.cpp
index cc2228bf27..4f9d8f3d5a 100644
--- a/protocols/Gadu-Gadu/src/image.cpp
+++ b/protocols/Gadu-Gadu/src/image.cpp
@@ -127,7 +127,7 @@ int GGPROTO::img_destroy()
// Destroy list
list_destroy(imagedlgs, 1);
- CallService(MS_CLIST_REMOVECONTACTMENUITEM, (WPARAM)hImageMenuItem, (LPARAM) 0);
+ CallService(MO_REMOVEMENUITEM, (WPARAM)hImageMenuItem, (LPARAM) 0);
return FALSE;
}
diff --git a/protocols/IRCG/src/services.cpp b/protocols/IRCG/src/services.cpp
index ae0ecb7267..e31a1ac7c9 100644
--- a/protocols/IRCG/src/services.cpp
+++ b/protocols/IRCG/src/services.cpp
@@ -175,10 +175,11 @@ void InitContactMenus(void)
void UninitContactMenus(void)
{
- CallService(MS_CLIST_REMOVECONTACTMENUITEM, (WPARAM)hUMenuChanSettings, 0);
- CallService(MS_CLIST_REMOVECONTACTMENUITEM, (WPARAM)hUMenuWhois, 0);
- CallService(MS_CLIST_REMOVECONTACTMENUITEM, (WPARAM)hUMenuDisconnect, 0);
- CallService(MS_CLIST_REMOVECONTACTMENUITEM, (WPARAM)hUMenuIgnore, 0);
+ CallService(MO_REMOVEMENUITEM, (WPARAM)hUMenuChanSettings, 0);
+ CallService(MO_REMOVEMENUITEM, (WPARAM)hUMenuWhois, 0);
+ CallService(MO_REMOVEMENUITEM, (WPARAM)hUMenuDisconnect, 0);
+ CallService(MO_REMOVEMENUITEM, (WPARAM)hUMenuIgnore, 0);
+
DestroyServiceFunction(hMenuChanSettings);
DestroyServiceFunction(hMenuWhois);
DestroyServiceFunction(hMenuDisconnect);
diff --git a/protocols/IcqOscarJ/src/icq_menu.cpp b/protocols/IcqOscarJ/src/icq_menu.cpp
index d083e282a7..0aebb2a2c7 100644
--- a/protocols/IcqOscarJ/src/icq_menu.cpp
+++ b/protocols/IcqOscarJ/src/icq_menu.cpp
@@ -164,12 +164,12 @@ void g_MenuInit(void)
void g_MenuUninit(void)
{
- CallService(MS_CLIST_REMOVECONTACTMENUITEM, (WPARAM)g_hContactMenuItems[ICMI_AUTH_REQUEST], 0);
- CallService(MS_CLIST_REMOVECONTACTMENUITEM, (WPARAM)g_hContactMenuItems[ICMI_AUTH_GRANT], 0);
- CallService(MS_CLIST_REMOVECONTACTMENUITEM, (WPARAM)g_hContactMenuItems[ICMI_AUTH_REVOKE], 0);
- CallService(MS_CLIST_REMOVECONTACTMENUITEM, (WPARAM)g_hContactMenuItems[ICMI_ADD_TO_SERVLIST], 0);
- CallService(MS_CLIST_REMOVECONTACTMENUITEM, (WPARAM)g_hContactMenuItems[ICMI_XSTATUS_DETAILS], 0);
- CallService(MS_CLIST_REMOVECONTACTMENUITEM, (WPARAM)g_hContactMenuItems[ICMI_OPEN_PROFILE], 0);
+ CallService(MO_REMOVEMENUITEM, (WPARAM)g_hContactMenuItems[ICMI_AUTH_REQUEST], 0);
+ CallService(MO_REMOVEMENUITEM, (WPARAM)g_hContactMenuItems[ICMI_AUTH_GRANT], 0);
+ CallService(MO_REMOVEMENUITEM, (WPARAM)g_hContactMenuItems[ICMI_AUTH_REVOKE], 0);
+ CallService(MO_REMOVEMENUITEM, (WPARAM)g_hContactMenuItems[ICMI_ADD_TO_SERVLIST], 0);
+ CallService(MO_REMOVEMENUITEM, (WPARAM)g_hContactMenuItems[ICMI_XSTATUS_DETAILS], 0);
+ CallService(MO_REMOVEMENUITEM, (WPARAM)g_hContactMenuItems[ICMI_OPEN_PROFILE], 0);
}
diff --git a/protocols/JabberG/src/jabber_menu.cpp b/protocols/JabberG/src/jabber_menu.cpp
index f1d507f208..986fd97a67 100644
--- a/protocols/JabberG/src/jabber_menu.cpp
+++ b/protocols/JabberG/src/jabber_menu.cpp
@@ -330,14 +330,14 @@ void g_MenuUninit(void)
{
DestroyHookableEvent(hStatusMenuInit);
- CallService(MS_CLIST_REMOVECONTACTMENUITEM, (WPARAM)g_hMenuRequestAuth, 0);
- CallService(MS_CLIST_REMOVECONTACTMENUITEM, (WPARAM)g_hMenuGrantAuth, 0);
- CallService(MS_CLIST_REMOVECONTACTMENUITEM, (WPARAM)g_hMenuRevokeAuth, 0);
- CallService(MS_CLIST_REMOVECONTACTMENUITEM, (WPARAM)g_hMenuConvert, 0);
- CallService(MS_CLIST_REMOVECONTACTMENUITEM, (WPARAM)g_hMenuRosterAdd, 0);
- CallService(MS_CLIST_REMOVECONTACTMENUITEM, (WPARAM)g_hMenuLogin, 0);
- CallService(MS_CLIST_REMOVECONTACTMENUITEM, (WPARAM)g_hMenuRefresh, 0);
- CallService(MS_CLIST_REMOVECONTACTMENUITEM, (WPARAM)g_hMenuAddBookmark, 0);
+ CallService(MO_REMOVEMENUITEM, (WPARAM)g_hMenuRequestAuth, 0);
+ CallService(MO_REMOVEMENUITEM, (WPARAM)g_hMenuGrantAuth, 0);
+ CallService(MO_REMOVEMENUITEM, (WPARAM)g_hMenuRevokeAuth, 0);
+ CallService(MO_REMOVEMENUITEM, (WPARAM)g_hMenuConvert, 0);
+ CallService(MO_REMOVEMENUITEM, (WPARAM)g_hMenuRosterAdd, 0);
+ CallService(MO_REMOVEMENUITEM, (WPARAM)g_hMenuLogin, 0);
+ CallService(MO_REMOVEMENUITEM, (WPARAM)g_hMenuRefresh, 0);
+ CallService(MO_REMOVEMENUITEM, (WPARAM)g_hMenuAddBookmark, 0);
WindowList_Destroy(hDialogsList);
}
@@ -912,7 +912,7 @@ void CJabberProto::GlobalMenuUninit()
{
if (m_phMenuResourceItems) {
for (int i=0; i < m_nMenuResourceItems; i++)
- CallService(MS_CLIST_REMOVECONTACTMENUITEM, (WPARAM)m_phMenuResourceItems[i], 0);
+ CallService(MO_REMOVEMENUITEM, (WPARAM)m_phMenuResourceItems[i], 0);
mir_free(m_phMenuResourceItems);
m_phMenuResourceItems = NULL;
}
diff --git a/protocols/MSN/src/msn_menu.cpp b/protocols/MSN/src/msn_menu.cpp
index 3646f6dc37..49f6e6201d 100644
--- a/protocols/MSN/src/msn_menu.cpp
+++ b/protocols/MSN/src/msn_menu.cpp
@@ -446,11 +446,11 @@ void MSN_InitContactMenu(void)
void MSN_RemoveContactMenus(void)
{
- CallService(MS_CLIST_REMOVECONTACTMENUITEM, (WPARAM)hBlockMenuItem, 0);
- CallService(MS_CLIST_REMOVECONTACTMENUITEM, (WPARAM)hLiveSpaceMenuItem, 0);
- CallService(MS_CLIST_REMOVECONTACTMENUITEM, (WPARAM)hNetmeetingMenuItem, 0);
- CallService(MS_CLIST_REMOVECONTACTMENUITEM, (WPARAM)hChatInviteMenuItem, 0);
- CallService(MS_CLIST_REMOVECONTACTMENUITEM, (WPARAM)hOpenInboxMenuItem, 0);
+ CallService(MO_REMOVEMENUITEM, (WPARAM)hBlockMenuItem, 0);
+ CallService(MO_REMOVEMENUITEM, (WPARAM)hLiveSpaceMenuItem, 0);
+ CallService(MO_REMOVEMENUITEM, (WPARAM)hNetmeetingMenuItem, 0);
+ CallService(MO_REMOVEMENUITEM, (WPARAM)hChatInviteMenuItem, 0);
+ CallService(MO_REMOVEMENUITEM, (WPARAM)hOpenInboxMenuItem, 0);
DestroyServiceFunction(hNetMeeting);
DestroyServiceFunction(hBlockCom);
diff --git a/protocols/Sametime/src/conference.cpp b/protocols/Sametime/src/conference.cpp
index 82d5e3110a..b99b25f74b 100644
--- a/protocols/Sametime/src/conference.cpp
+++ b/protocols/Sametime/src/conference.cpp
@@ -553,7 +553,7 @@ void CSametimeProto::InitConferenceMenu()
void CSametimeProto::DeinitConferenceMenu()
{
debugLog(_T("CSametimeProto::DeinitConferenceMenu()"));
- CallService(MS_CLIST_REMOVECONTACTMENUITEM, (WPARAM)hLeaveChatMenuItem, (LPARAM)0);
- CallService(MS_CLIST_REMOVECONTACTMENUITEM, (WPARAM)hCreateChatMenuItem, (LPARAM)0);
+ CallService(MO_REMOVEMENUITEM, (WPARAM)hLeaveChatMenuItem, 0);
+ CallService(MO_REMOVEMENUITEM, (WPARAM)hCreateChatMenuItem, 0);
}
diff --git a/protocols/Sametime/src/sametime_session.cpp b/protocols/Sametime/src/sametime_session.cpp
index b00b97457c..5abc64a675 100644
--- a/protocols/Sametime/src/sametime_session.cpp
+++ b/protocols/Sametime/src/sametime_session.cpp
@@ -587,7 +587,7 @@ void CSametimeProto::InitSessionMenu()
void CSametimeProto::DeinitSessionMenu()
{
debugLog(_T("CSametimeProto::DeinitSessionMenu()"));
- CallService(MS_CLIST_REMOVECONTACTMENUITEM, (WPARAM)hSessionAnnounceMenuItem, (LPARAM)0);
+ CallService(MO_REMOVEMENUITEM, (WPARAM)hSessionAnnounceMenuItem, 0);
}
void CSametimeProto::InitCritSection()
diff --git a/protocols/Tlen/src/tlen.cpp b/protocols/Tlen/src/tlen.cpp
index 7b4adbf6a6..92d7e4f813 100644
--- a/protocols/Tlen/src/tlen.cpp
+++ b/protocols/Tlen/src/tlen.cpp
@@ -351,11 +351,12 @@ void uninitMenuItems(TlenProtocol *proto)
CallService(MS_CLIST_REMOVEMAINMENUITEM, (WPARAM)proto->hMenuMUC, (LPARAM) 0);
CallService(MS_CLIST_REMOVEMAINMENUITEM, (WPARAM)proto->hMenuInbox, (LPARAM) 0);
CallService(MS_CLIST_REMOVEMAINMENUITEM, (WPARAM)proto->hMenuRoot, (LPARAM) 0);
- CallService(MS_CLIST_REMOVECONTACTMENUITEM, (WPARAM)proto->hMenuContactMUC, (LPARAM) 0);
- CallService(MS_CLIST_REMOVECONTACTMENUITEM, (WPARAM)proto->hMenuPicture, (LPARAM) 0);
- CallService(MS_CLIST_REMOVECONTACTMENUITEM, (WPARAM)proto->hMenuContactVoice, (LPARAM) 0);
- CallService(MS_CLIST_REMOVECONTACTMENUITEM, (WPARAM)proto->hMenuContactRequestAuth, (LPARAM) 0);
- CallService(MS_CLIST_REMOVECONTACTMENUITEM, (WPARAM)proto->hMenuContactGrantAuth, (LPARAM) 0);
+
+ CallService(MO_REMOVEMENUITEM, (WPARAM)proto->hMenuContactMUC, 0);
+ CallService(MO_REMOVEMENUITEM, (WPARAM)proto->hMenuPicture, 0);
+ CallService(MO_REMOVEMENUITEM, (WPARAM)proto->hMenuContactVoice, 0);
+ CallService(MO_REMOVEMENUITEM, (WPARAM)proto->hMenuContactRequestAuth, 0);
+ CallService(MO_REMOVEMENUITEM, (WPARAM)proto->hMenuContactGrantAuth, 0);
}
TlenProtocol* tlenProtoInit(const char* pszProtoName, const TCHAR* tszUserName)
diff --git a/protocols/Twitter/src/theme.cpp b/protocols/Twitter/src/theme.cpp
index f2abf6ab71..5e7235f7c2 100644
--- a/protocols/Twitter/src/theme.cpp
+++ b/protocols/Twitter/src/theme.cpp
@@ -106,7 +106,7 @@ void InitContactMenus()
void UninitContactMenus()
{
for(size_t i=0; i<SIZEOF(g_hMenuItems); i++)
- CallService(MS_CLIST_REMOVECONTACTMENUITEM,(WPARAM)g_hMenuItems[i],0);
+ CallService(MO_REMOVEMENUITEM, (WPARAM)g_hMenuItems[i], 0);
UnhookEvent(g_hMenuEvts[0]);
for(size_t i=1; i<SIZEOF(g_hMenuEvts); i++)
diff --git a/protocols/VKontakte/src/vk_proto.cpp b/protocols/VKontakte/src/vk_proto.cpp
index f5cd32a99d..249f1da6fb 100644
--- a/protocols/VKontakte/src/vk_proto.cpp
+++ b/protocols/VKontakte/src/vk_proto.cpp
@@ -157,7 +157,7 @@ void CVkProto::UnInitMenus()
CallService(MO_REMOVEMENUITEM, (WPARAM)g_hProtoMenuItems[i], 0);
for (int i = 0; i < CMI_COUNT; i++)
- CallService(MS_CLIST_REMOVECONTACTMENUITEM, (WPARAM)g_hContactMenuItems[i], 0);
+ CallService(MO_REMOVEMENUITEM, (WPARAM)g_hContactMenuItems[i], 0);
}
int CVkProto::OnPreShutdown(WPARAM wParam, LPARAM lParam)
diff --git a/protocols/Yahoo/src/services.cpp b/protocols/Yahoo/src/services.cpp
index f5e0aa30dc..7b8b30f2e5 100644
--- a/protocols/Yahoo/src/services.cpp
+++ b/protocols/Yahoo/src/services.cpp
@@ -490,7 +490,7 @@ void CYahooProto::MenuUninit( void )
if ( mainMenuRoot )
CallService(MS_CLIST_REMOVEMAINMENUITEM, (WPARAM)mainMenuRoot, 0);
- CallService(MS_CLIST_REMOVECONTACTMENUITEM, (WPARAM)hShowProfileMenuItem, 0);
+ CallService(MO_REMOVEMENUITEM, (WPARAM)hShowProfileMenuItem, 0);
}
int __cdecl CYahooProto::OnPrebuildContactMenu(WPARAM hContact, LPARAM)
diff --git a/src/modules/clist/clistmenus.cpp b/src/modules/clist/clistmenus.cpp
index ac0c408287..6e92577cc7 100644
--- a/src/modules/clist/clistmenus.cpp
+++ b/src/modules/clist/clistmenus.cpp
@@ -274,12 +274,6 @@ INT_PTR FreeOwnerDataMainMenu(WPARAM, LPARAM lParam)
/////////////////////////////////////////////////////////////////////////////////////////
// CONTACT MENU
-static INT_PTR RemoveContactMenuItem(WPARAM wParam, LPARAM)
-{
- CallService(MO_REMOVEMENUITEM, wParam, 0);
- return 0;
-}
-
static INT_PTR AddContactMenuItem(WPARAM, LPARAM lParam)
{
TMO_MenuItem tmi;
@@ -1287,7 +1281,6 @@ void InitCustomMenus(void)
CreateServiceFunction("CList/AddContactMenuItem", AddContactMenuItem);
CreateServiceFunction(MS_CLIST_MENUBUILDCONTACT, BuildContactMenu);
- CreateServiceFunction(MS_CLIST_REMOVECONTACTMENUITEM, RemoveContactMenuItem);
CreateServiceFunction(MS_CLIST_SHOWHIDEMENUITEM, ShowHideMenuItem);
CreateServiceFunction(MS_CLIST_MODIFYMENUITEM, ModifyCustomMenuItem);
diff --git a/src/modules/clist/movetogroup.cpp b/src/modules/clist/movetogroup.cpp
index 2680c7e218..48e14cfb20 100644
--- a/src/modules/clist/movetogroup.cpp
+++ b/src/modules/clist/movetogroup.cpp
@@ -98,7 +98,7 @@ static int OnContactMenuBuild(WPARAM wParam, LPARAM)
}
for (i=0; i < lphGroupsItems.getCount(); i++)
- CallService(MS_CLIST_REMOVECONTACTMENUITEM, (WPARAM)lphGroupsItems[i], 0);
+ CallService(MO_REMOVEMENUITEM, (WPARAM)lphGroupsItems[i], 0);
lphGroupsItems.destroy();
ptrT szContactGroup(db_get_tsa(wParam, "CList", "Group"));
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-15 16:45:24 +0000