From 8cbf63303a7f35241fa1ba2bd4ca8306e81d1837 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Tue, 16 Sep 2014 13:51:27 +0000
Subject: useless service MS_CLIST_REMOVECONTACTMENUITEM deleted

git-svn-id: http://svn.miranda-ng.org/main/trunk@10479 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 protocols/AimOscar/src/theme.cpp            |  8 ++++----
 protocols/FacebookRM/src/theme.cpp          |  2 +-
 protocols/Gadu-Gadu/src/gg.cpp              |  2 +-
 protocols/Gadu-Gadu/src/image.cpp           |  2 +-
 protocols/IRCG/src/services.cpp             |  9 +++++----
 protocols/IcqOscarJ/src/icq_menu.cpp        | 12 ++++++------
 protocols/JabberG/src/jabber_menu.cpp       | 18 +++++++++---------
 protocols/MSN/src/msn_menu.cpp              | 10 +++++-----
 protocols/Sametime/src/conference.cpp       |  4 ++--
 protocols/Sametime/src/sametime_session.cpp |  2 +-
 protocols/Tlen/src/tlen.cpp                 | 11 ++++++-----
 protocols/Twitter/src/theme.cpp             |  2 +-
 protocols/VKontakte/src/vk_proto.cpp        |  2 +-
 protocols/Yahoo/src/services.cpp            |  2 +-
 14 files changed, 44 insertions(+), 42 deletions(-)

(limited to 'protocols')

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)
-- 
cgit v1.2.3