3 files changed, 11 insertions, 36 deletions
diff --git a/plugins/Clist_nicer/src/CLUIFrames/cluiframes.cpp b/plugins/Clist_nicer/src/CLUIFrames/cluiframes.cpp
index 6fe8fffc31..53f13990c4 100644
--- a/plugins/Clist_nicer/src/CLUIFrames/cluiframes.cpp
+++ b/plugins/Clist_nicer/src/CLUIFrames/cluiframes.cpp
@@ -3109,17 +3109,17 @@ static int CLUIFrameOnModulesUnload(WPARAM wParam, LPARAM lParam)
 	WaitForSingleObject(hThreadMFUpdate, 2000);
 	CloseHandle(g_hEventThread);
 
-	CallService(MS_CLIST_REMOVECONTEXTFRAMEMENUITEM, (LPARAM)contMIVisible, 0);
-	CallService(MS_CLIST_REMOVECONTEXTFRAMEMENUITEM, (LPARAM)contMITitle, 0);
-	CallService(MS_CLIST_REMOVECONTEXTFRAMEMENUITEM, (LPARAM)contMITBVisible, 0);
-	CallService(MS_CLIST_REMOVECONTEXTFRAMEMENUITEM, (LPARAM)contMILock, 0);
-	CallService(MS_CLIST_REMOVECONTEXTFRAMEMENUITEM, (LPARAM)contMIColl, 0);
-	CallService(MS_CLIST_REMOVECONTEXTFRAMEMENUITEM, (LPARAM)contMIFloating, 0);
-	CallService(MS_CLIST_REMOVECONTEXTFRAMEMENUITEM, (LPARAM)contMIAlignRoot, 0);
-	CallService(MS_CLIST_REMOVECONTEXTFRAMEMENUITEM, (LPARAM)contMIAlignTop, 0);
-	CallService(MS_CLIST_REMOVECONTEXTFRAMEMENUITEM, (LPARAM)contMIAlignClient, 0);
-	CallService(MS_CLIST_REMOVECONTEXTFRAMEMENUITEM, (LPARAM)contMIAlignBottom, 0);
-	CallService(MS_CLIST_REMOVECONTEXTFRAMEMENUITEM, (LPARAM)contMIBorder, 0);
+	CallService(MO_REMOVEMENUITEM, (LPARAM)contMIVisible, 0);
+	CallService(MO_REMOVEMENUITEM, (LPARAM)contMITitle, 0);
+	CallService(MO_REMOVEMENUITEM, (LPARAM)contMITBVisible, 0);
+	CallService(MO_REMOVEMENUITEM, (LPARAM)contMILock, 0);
+	CallService(MO_REMOVEMENUITEM, (LPARAM)contMIColl, 0);
+	CallService(MO_REMOVEMENUITEM, (LPARAM)contMIFloating, 0);
+	CallService(MO_REMOVEMENUITEM, (LPARAM)contMIAlignRoot, 0);
+	CallService(MO_REMOVEMENUITEM, (LPARAM)contMIAlignTop, 0);
+	CallService(MO_REMOVEMENUITEM, (LPARAM)contMIAlignClient, 0);
+	CallService(MO_REMOVEMENUITEM, (LPARAM)contMIAlignBottom, 0);
+	CallService(MO_REMOVEMENUITEM, (LPARAM)contMIBorder, 0);
 	return 0;
 }
 
diff --git a/plugins/Clist_nicer/src/CLUIFrames/framesmenu.cpp b/plugins/Clist_nicer/src/CLUIFrames/framesmenu.cpp
index 8b2f6987b1..0169a29957 100644
--- a/plugins/Clist_nicer/src/CLUIFrames/framesmenu.cpp
+++ b/plugins/Clist_nicer/src/CLUIFrames/framesmenu.cpp
@@ -45,12 +45,6 @@ static INT_PTR AddContextFrameMenuItem(WPARAM wParam, LPARAM lParam)
 	return CallService(MO_ADDNEWMENUITEM, (WPARAM)hFrameMenuObject, (LPARAM)&tmi);
 }
 
-static INT_PTR RemoveContextFrameMenuItem(WPARAM wParam, LPARAM lParam)
-{
-	CallService(MO_REMOVEMENUITEM, wParam, 0);
-	return 0;
-}
-
 //called with:
 //wparam - ownerdata
 //lparam - lparam from winproc
@@ -111,7 +105,6 @@ int InitFramesMenus(void)
 	CreateServiceFunction("FrameMenuCheckService", FrameMenuCheckService);
 	CreateServiceFunction("FrameMenuFreeService", FreeOwnerDataFrameMenu);
 
-	CreateServiceFunction(MS_CLIST_REMOVECONTEXTFRAMEMENUITEM, RemoveContextFrameMenuItem);
 	CreateServiceFunction("CList/AddContextFrameMenuItem", AddContextFrameMenuItem);
 	CreateServiceFunction(MS_CLIST_MENUBUILDFRAMECONTEXT, BuildContextFrameMenu);
 	CreateServiceFunction(MS_CLIST_FRAMEMENUNOTIFY, ContextFrameMenuNotify);
diff --git a/plugins/Clist_nicer/src/CLUIFrames/groupmenu.cpp b/plugins/Clist_nicer/src/CLUIFrames/groupmenu.cpp
index 59ce2d1064..f4c8b2ed89 100644
--- a/plugins/Clist_nicer/src/CLUIFrames/groupmenu.cpp
+++ b/plugins/Clist_nicer/src/CLUIFrames/groupmenu.cpp
@@ -51,14 +51,6 @@ typedef struct {
 	int Param1,Param2;
 } GroupMenuExecParam, *lpGroupMenuExecParam;
 
-//wparam = handle to the menu item returned by MS_CLIST_ADDCONTACTMENUITEM
-//return 0 on success.
-static INT_PTR RemoveGroupMenuItem(WPARAM wParam, LPARAM lParam)
-{
-	CallService(MO_REMOVEMENUITEM, wParam, 0);
-	return 0;
-}
-
 static INT_PTR BuildGroupMenu(WPARAM wParam, LPARAM lParam)
 {
 	int tick;
@@ -248,7 +240,6 @@ void InitGroupMenus(void)
 	CreateServiceFunction("CLISTMENUSGroup/HideOfflineRootHelper", HideOfflineRootHelper);
 
 	CreateServiceFunction("CList/AddGroupMenuItem", AddGroupMenuItem);
-	CreateServiceFunction(MS_CLIST_REMOVEGROUPMENUITEM, RemoveGroupMenuItem);
 	CreateServiceFunction(MS_CLIST_MENUBUILDGROUP, BuildGroupMenu);
 	hPreBuildGroupMenuEvent = CreateHookableEvent(ME_CLIST_PREBUILDGROUPMENU);
 	HookEvent(ME_CLIST_PREBUILDGROUPMENU, OnBuildGroupMenu);
@@ -387,14 +378,6 @@ typedef struct {
 	int Param1, Param2;
 } SubGroupMenuExecParam, *lpSubGroupMenuExecParam;
 
-//wparam = handle to the menu item returned by MS_CLIST_ADDCONTACTMENUITEM
-//return 0 on success.
-static INT_PTR RemoveSubGroupMenuItem(WPARAM wParam, LPARAM lParam)
-{
-	CallService(MO_REMOVEMENUITEM, wParam, 0);
-	return 0;
-}
-
 static int OnBuildSubGroupMenu(WPARAM wParam, LPARAM lParam)
 {
 	ClcGroup *group = (ClcGroup *)wParam;
@@ -532,7 +515,6 @@ void InitSubGroupMenus(void)
 	//CreateServiceFunction("CLISTMENUSSubGroup/HideOfflineRootHelper", HideOfflineRootHelper);
 
 	CreateServiceFunction("CList/AddSubGroupMenuItem", AddSubGroupMenuItem);
-	CreateServiceFunction(MS_CLIST_REMOVESUBGROUPMENUITEM, RemoveSubGroupMenuItem);
 	CreateServiceFunction(MS_CLIST_MENUBUILDSUBGROUP, BuildSubGroupMenu);
 	hPreBuildSubGroupMenuEvent = CreateHookableEvent(ME_CLIST_PREBUILDSUBGROUPMENU);
 	HookEvent(ME_CLIST_PREBUILDSUBGROUPMENU, OnBuildSubGroupMenu);