- all MS_CLIST_ADD*ITEM services replaced with Menu_Add*Item stubs.

- massive cleanup of the menu-related code

git-svn-id: http://svn.miranda-ng.org/main/trunk@410 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

5 files changed, 48 insertions, 50 deletions

diff --git a/plugins/Mwclist/CLUIFrames/cluiframes.cpp b/plugins/Mwclist/CLUIFrames/cluiframes.cpp
index 12d4f71ac4..ab56da832d 100644
--- a/plugins/Mwclist/CLUIFrames/cluiframes.cpp
+++ b/plugins/Mwclist/CLUIFrames/cluiframes.cpp
@@ -630,7 +630,7 @@ int CLUIFramesGetalClientFrame(void)
 	return -1;

 }

 

-HMENU CLUIFramesCreateMenuForFrame(int frameid,int root,int popuppos,char *addservice)

+HMENU CLUIFramesCreateMenuForFrame(int frameid,int root,int popuppos,HGENMENU (*pfnAdd )( CLISTMENUITEM* ))

 {

 	CLISTMENUITEM mi;

 	//TMO_MenuItem tmi;

@@ -647,7 +647,7 @@ HMENU CLUIFramesCreateMenuForFrame(int frameid,int root,int popuppos,char *addse
 	mi.pszName = LPGEN("&FrameTitle");

 	mi.flags = CMIF_CHILDPOPUP|CMIF_GRAYED;

 	mi.pszContactOwner = (char *)0;

-	menuid = (HANDLE)CallService(addservice,0,(LPARAM)&mi);

+	menuid = pfnAdd(&mi);

 	if (frameid == -1) contMITitle = menuid;

 	else Frames[framepos].MenuHandles.MITitle = menuid;

 

@@ -661,7 +661,7 @@ HMENU CLUIFramesCreateMenuForFrame(int frameid,int root,int popuppos,char *addse
 	mi.flags = CMIF_CHILDPOPUP|CMIF_CHECKED;

 	mi.pszContactOwner = (char *)0;

 	mi.pszService = MS_CLIST_FRAMES_SHFRAME;

-	menuid = (HANDLE)CallService(addservice,0,(LPARAM)&mi);

+	menuid = pfnAdd(&mi);

 	if (frameid == -1) contMIVisible = menuid;

 	else Frames[framepos].MenuHandles.MIVisible = menuid;

 

@@ -672,7 +672,7 @@ HMENU CLUIFramesCreateMenuForFrame(int frameid,int root,int popuppos,char *addse
 	mi.flags = CMIF_CHILDPOPUP|CMIF_CHECKED;

 	mi.pszService = MS_CLIST_FRAMES_SHFRAMETITLEBAR;

 	mi.pszContactOwner = (char *)0;

-	menuid = (HANDLE)CallService(addservice,0,(LPARAM)&mi);

+	menuid = pfnAdd(&mi);

 	if (frameid == -1) contMITBVisible = menuid;

 	else Frames[framepos].MenuHandles.MITBVisible = menuid;

 

@@ -686,7 +686,7 @@ HMENU CLUIFramesCreateMenuForFrame(int frameid,int root,int popuppos,char *addse
 	mi.flags = CMIF_CHILDPOPUP|CMIF_CHECKED;

 	mi.pszService = MS_CLIST_FRAMES_ULFRAME;

 	mi.pszContactOwner = (char *)0;

-	menuid = (HANDLE)CallService(addservice,0,(LPARAM)&mi);

+	menuid = pfnAdd(&mi);

 	if (frameid == -1) contMILock = menuid;

 	else Frames[framepos].MenuHandles.MILock = menuid;

 

@@ -697,7 +697,7 @@ HMENU CLUIFramesCreateMenuForFrame(int frameid,int root,int popuppos,char *addse
 	mi.flags = CMIF_CHILDPOPUP|CMIF_CHECKED;

 	mi.pszService = MS_CLIST_FRAMES_UCOLLFRAME;

 	mi.pszContactOwner = (char *)0;

-	menuid = (HANDLE)CallService(addservice,0,(LPARAM)&mi);

+	menuid = pfnAdd(&mi);

 	if (frameid == -1) contMIColl = menuid;

 	else Frames[framepos].MenuHandles.MIColl = menuid;

 

@@ -709,7 +709,7 @@ HMENU CLUIFramesCreateMenuForFrame(int frameid,int root,int popuppos,char *addse
 	mi.flags = CMIF_CHILDPOPUP;

 	mi.pszService = "Set_Floating";

 	mi.pszContactOwner = (char *)0;

-	menuid = (HANDLE)CallService(addservice,0,(LPARAM)&mi);

+	menuid = pfnAdd(&mi);

 	if (frameid == -1) contMIFloating = menuid;

 	else Frames[framepos].MenuHandles.MIFloating = menuid;

 

@@ -723,7 +723,7 @@ HMENU CLUIFramesCreateMenuForFrame(int frameid,int root,int popuppos,char *addse
 	mi.flags = CMIF_CHILDPOPUP|CMIF_CHECKED;

 	mi.pszService = MS_CLIST_FRAMES_SETUNBORDER;

 	mi.pszContactOwner = (char *)0;

-	menuid = (HANDLE)CallService(addservice,0,(LPARAM)&mi);

+	menuid = pfnAdd(&mi);

 	if (frameid == -1) contMIBorder = menuid;

 	else Frames[framepos].MenuHandles.MIBorder = menuid;

 

@@ -737,7 +737,7 @@ HMENU CLUIFramesCreateMenuForFrame(int frameid,int root,int popuppos,char *addse
 	mi.flags = CMIF_CHILDPOPUP|CMIF_ROOTPOPUP;

 	mi.pszService = "";

 	mi.pszContactOwner = (char *)0;

-	menuid = (HANDLE)CallService(addservice,0,(LPARAM)&mi);

+	menuid = pfnAdd(&mi);

 	if (frameid == -1) contMIAlignRoot = menuid;

 	else Frames[framepos].MenuHandles.MIAlignRoot = menuid;

 

@@ -749,7 +749,7 @@ HMENU CLUIFramesCreateMenuForFrame(int frameid,int root,int popuppos,char *addse
 	mi.pszName = LPGEN("&Top");

 	mi.pszService = CLUIFRAMESSETALIGNALTOP;

 	mi.pszContactOwner = (char *)alTop;

-	menuid = (HANDLE)CallService(addservice,0,(LPARAM)&mi);

+	menuid = pfnAdd(&mi);

 	if (frameid == -1) contMIAlignTop = menuid;

 	else Frames[framepos].MenuHandles.MIAlignTop = menuid;

 

@@ -759,7 +759,7 @@ HMENU CLUIFramesCreateMenuForFrame(int frameid,int root,int popuppos,char *addse
 	mi.pszName = LPGEN("&Client");

 	mi.pszService = CLUIFRAMESSETALIGNALCLIENT;

 	mi.pszContactOwner = (char *)alClient;

-	menuid = (HANDLE)CallService(addservice,0,(LPARAM)&mi);

+	menuid = pfnAdd(&mi);

 	if (frameid == -1) contMIAlignClient = menuid;

 	else Frames[framepos].MenuHandles.MIAlignClient = menuid;

 

@@ -768,7 +768,7 @@ HMENU CLUIFramesCreateMenuForFrame(int frameid,int root,int popuppos,char *addse
 	mi.pszName = LPGEN("&Bottom");

 	mi.pszService = CLUIFRAMESSETALIGNALBOTTOM;

 	mi.pszContactOwner = (char *)alBottom;

-	menuid = (HANDLE)CallService(addservice,0,(LPARAM)&mi);

+	menuid = pfnAdd(&mi);

 	if (frameid == -1) contMIAlignBottom = menuid;

 	else Frames[framepos].MenuHandles.MIAlignBottom = menuid;

 

@@ -781,7 +781,7 @@ HMENU CLUIFramesCreateMenuForFrame(int frameid,int root,int popuppos,char *addse
 	mi.flags = CMIF_CHILDPOPUP|CMIF_ROOTPOPUP;

 	mi.pszService = "";

 	mi.pszContactOwner = (char *)0;

-	menuid = (HANDLE)CallService(addservice,0,(LPARAM)&mi);

+	menuid = pfnAdd(&mi);

 

 	mi.pszPopupName = (char *)menuid;

 	mi.popupPosition = frameid;

@@ -790,7 +790,7 @@ HMENU CLUIFramesCreateMenuForFrame(int frameid,int root,int popuppos,char *addse
 	mi.flags = CMIF_CHILDPOPUP;

 	mi.pszService = CLUIFRAMESMOVEUPDOWN;

 	mi.pszContactOwner = (char *)1;

-	CallService(addservice,0,(LPARAM)&mi);

+	pfnAdd(&mi);

 

 	mi.pszPopupName = (char *)menuid;

 	mi.popupPosition = frameid;

@@ -799,7 +799,7 @@ HMENU CLUIFramesCreateMenuForFrame(int frameid,int root,int popuppos,char *addse
 	mi.flags = CMIF_CHILDPOPUP;

 	mi.pszService = CLUIFRAMESMOVEUPDOWN;

 	mi.pszContactOwner = (char *)-1;

-	CallService(addservice,0,(LPARAM)&mi);

+	pfnAdd(&mi);

 

 	return 0;

 }

@@ -1433,7 +1433,7 @@ static int CLUIFramesLoadMainMenu()
 		mi.pszPopupName = LPGEN("Frames");

 		mi.pszName = LPGEN("New Menu System not Found...");

 		mi.pszService = "";

-		CallService(MS_CLIST_ADDMAINMENUITEM,0,(LPARAM)&mi);

+		Menu_AddMainMenuItem(&mi);

 

 		// create "show all frames" menu

 		mi.hIcon = NULL;//LoadIcon(g_hInst,MAKEINTRESOURCE(IDI_MIRANDA));

@@ -1442,7 +1442,7 @@ static int CLUIFramesLoadMainMenu()
 		mi.pszPopupName = LPGEN("Frames");

 		mi.pszName = LPGEN("Show All Frames");

 		mi.pszService = MS_CLIST_FRAMES_SHOWALLFRAMES;

-		CallService(MS_CLIST_ADDMAINMENUITEM,0,(LPARAM)&mi);

+		Menu_AddMainMenuItem(&mi);

 

 		mi.hIcon = NULL;//LoadIcon(g_hInst,MAKEINTRESOURCE(IDI_HELP));

 		mi.position = 10100001;

@@ -1450,7 +1450,7 @@ static int CLUIFramesLoadMainMenu()
 		mi.flags = CMIF_CHILDPOPUP;

 		mi.pszName = LPGEN("Show All Titlebars");

 		mi.pszService = MS_CLIST_FRAMES_SHOWALLFRAMESTB;

-		CallService(MS_CLIST_ADDMAINMENUITEM,0,(LPARAM)&mi);

+		Menu_AddMainMenuItem(&mi);

 		return 0;

 	}

 

@@ -1469,7 +1469,7 @@ static int CLUIFramesLoadMainMenu()
 	mi.pszPopupName = (char*)-1;

 	mi.pszName = LPGEN("Frames");

 	mi.pszService = 0;

-	MainMIRoot = (HGENMENU)CallService(MS_CLIST_ADDMAINMENUITEM,0,(LPARAM)&mi);

+	MainMIRoot = Menu_AddMainMenuItem(&mi);

 

 	// create frames menu

 	separator = 3000200000;

@@ -1480,8 +1480,8 @@ static int CLUIFramesLoadMainMenu()
 		mi.hParentMenu = MainMIRoot;

 		mi.ptszName = Frames[i].TitleBar.tbname ? Frames[i].TitleBar.tbname : Frames[i].name;

 		mi.pszService = 0;

-		Frames[i].MenuHandles.MainMenuItem = (HANDLE)CallService(MS_CLIST_ADDMAINMENUITEM,0,(LPARAM)&mi);

-		CLUIFramesCreateMenuForFrame(Frames[i].id,(int)Frames[i].MenuHandles.MainMenuItem,separator,MS_CLIST_ADDMAINMENUITEM);

+		Frames[i].MenuHandles.MainMenuItem = Menu_AddMainMenuItem(&mi);

+		CLUIFramesCreateMenuForFrame(Frames[i].id,(int)Frames[i].MenuHandles.MainMenuItem,separator,Menu_AddMainMenuItem);

 		CLUIFramesModifyMainMenuItems(Frames[i].id,0);

 		//NotifyEventHooks(hPreBuildFrameMenuEvent,i,(LPARAM)Frames[i].MenuHandles.MainMenuItem);

 		CallService(MS_CLIST_FRAMEMENUNOTIFY,(WPARAM)Frames[i].id,(LPARAM)Frames[i].MenuHandles.MainMenuItem);

@@ -1497,7 +1497,7 @@ static int CLUIFramesLoadMainMenu()
 	mi.hParentMenu = MainMIRoot;

 	mi.pszName = LPGEN("Show All Frames");

 	mi.pszService = MS_CLIST_FRAMES_SHOWALLFRAMES;

-	CallService(MS_CLIST_ADDMAINMENUITEM,0,(LPARAM)&mi);

+	Menu_AddMainMenuItem(&mi);

 

 	// create "show all titlebars" menu

 	mi.hIcon = NULL;

@@ -1506,7 +1506,7 @@ static int CLUIFramesLoadMainMenu()
 	mi.flags = CMIF_CHILDPOPUP;

 	mi.pszName = LPGEN("Show All Titlebars");

 	mi.pszService = MS_CLIST_FRAMES_SHOWALLFRAMESTB;

-	CallService(MS_CLIST_ADDMAINMENUITEM,0,(LPARAM)&mi);

+	Menu_AddMainMenuItem(&mi);

 

 	// create "hide all titlebars" menu

 	mi.hIcon = NULL;

@@ -1515,7 +1515,7 @@ static int CLUIFramesLoadMainMenu()
 	mi.flags = CMIF_CHILDPOPUP;

 	mi.pszName = LPGEN("Hide All Titlebars");

 	mi.pszService = MS_CLIST_FRAMES_HIDEALLFRAMESTB;

-	CallService(MS_CLIST_ADDMAINMENUITEM,0,(LPARAM)&mi);

+	Menu_AddMainMenuItem(&mi);

 	return 0;

 }

 

@@ -2869,7 +2869,7 @@ static void CLUIRegisterFonts()
 static int CLUIFrameOnModulesLoad(WPARAM wParam,LPARAM lParam)

 {

 	CLUIFramesLoadMainMenu();

-	CLUIFramesCreateMenuForFrame(-1,-1,000010000,MS_CLIST_ADDCONTEXTFRAMEMENUITEM);

+	CLUIFramesCreateMenuForFrame(-1,-1,000010000,Menu_AddContextFrameMenuItem);

 	CLUIRegisterFonts();

 	return 0;

 }

diff --git a/plugins/Mwclist/CLUIFrames/framesmenu.cpp b/plugins/Mwclist/CLUIFrames/framesmenu.cpp
index fc47474b2a..7a34206512 100644
--- a/plugins/Mwclist/CLUIFrames/framesmenu.cpp
+++ b/plugins/Mwclist/CLUIFrames/framesmenu.cpp
@@ -205,7 +205,7 @@ int InitFramesMenus(void)
 

 

 		CreateServiceFunction(MS_CLIST_REMOVECONTEXTFRAMEMENUITEM,RemoveContextFrameMenuItem);

-		CreateServiceFunction(MS_CLIST_ADDCONTEXTFRAMEMENUITEM,AddContextFrameMenuItem);

+		CreateServiceFunction("CList/AddContextFrameMenuItem",AddContextFrameMenuItem);

 		CreateServiceFunction(MS_CLIST_MENUBUILDFRAMECONTEXT,BuildContextFrameMenu);

 		CreateServiceFunction(MS_CLIST_FRAMEMENUNOTIFY,ContextFrameMenuNotify);

 		hPreBuildFrameMenuEvent = CreateHookableEvent(ME_CLIST_PREBUILDFRAMEMENU);

diff --git a/plugins/Mwclist/clcfonts.cpp b/plugins/Mwclist/clcfonts.cpp
index d6039ecb27..346c53c9f3 100644
--- a/plugins/Mwclist/clcfonts.cpp
+++ b/plugins/Mwclist/clcfonts.cpp
@@ -56,8 +56,6 @@ static int fontListOrder[FONTID_MAX + 1]  =
 

 #define CLCDEFAULT_BKCOLOUR      GetSysColor(COLOR_3DFACE)

 #define CLCDEFAULT_SELTEXTCOLOUR GetSysColor(COLOR_HIGHLIGHTTEXT)

-#define CLCDEFAULT_HOTTEXTCOLOUR (IsWinVer98Plus()?RGB(0,0,255):GetSysColor(COLOR_HOTLIGHT))

-#define CLCDEFAULT_QUICKSEARCHCOLOUR RGB(255,255,0)

 

 static int FS_FontsChanged(WPARAM wParam, LPARAM lParam)

 {

diff --git a/plugins/Mwclist/clisttray.cpp b/plugins/Mwclist/clisttray.cpp
index 04e71c6a0c..82ce1a2f16 100644
--- a/plugins/Mwclist/clisttray.cpp
+++ b/plugins/Mwclist/clisttray.cpp
@@ -2,8 +2,8 @@
 

 Miranda IM: the free IM client for Microsoft* Windows*

 

-Copyright 2000-2003 Miranda ICQ/IM project, 

-all portions of this codebase are copyrighted to the people 

+Copyright 2000-2003 Miranda ICQ/IM project,

+all portions of this codebase are copyrighted to the people

 listed in contributors.txt.

 

 This program is free software; you can redistribute it and/or

@@ -42,7 +42,7 @@ INT_PTR TrayIconProcessMessage(WPARAM wParam,LPARAM lParam)
 	case TIM_CALLBACK:

 		if (msg->lParam == WM_RBUTTONUP)

 		{

-			POINT pt;	

+			POINT pt;

 			HMENU hMenu = (HMENU)CallService(MS_CLIST_MENUBUILDTRAY,(WPARAM)0,(LPARAM)0);

 

 			SetForegroundWindow(msg->hwnd);

@@ -56,7 +56,7 @@ INT_PTR TrayIconProcessMessage(WPARAM wParam,LPARAM lParam)
 		*((LRESULT*)lParam) = 0;

 		return TRUE;

 	}

-	

+

 	return saveTrayIconProcessMessage( wParam, lParam );

 }

 

@@ -95,7 +95,7 @@ static INT_PTR BuildTrayMenu(WPARAM wParam,LPARAM lParam)
 	hMenu = CreatePopupMenu();

 	//hMenu = wParam;

 	tick = GetTickCount();

-	

+

 	NotifyEventHooks(hPreBuildTrayMenuEvent,0,0);

 

 	CallService(MO_BUILDMENU,(WPARAM)hMenu,(LPARAM)&param);

@@ -125,17 +125,17 @@ static INT_PTR AddTrayMenuItem(WPARAM wParam,LPARAM lParam)
 	tmi.root = (HGENMENU)mi->pszPopupName;

 

 	tmi.ownerdata = NULL;

-	

+

 	{

 		lpTrayMenuExecParam mmep;

 		mmep = (lpTrayMenuExecParam)mir_alloc(sizeof(TrayMenuExecParam));

 		if (mmep == NULL)

 			return 0;

-		

+

 		//we need just one parametr.

 		mmep->szServiceName = mir_strdup(mi->pszService);

 		mmep->Param1 = mi->popupPosition;

-		

+

 		tmi.ownerdata = mmep;

 	}

 	op.Handle = (HANDLE)CallService(MO_ADDNEWMENUITEM,(WPARAM)hTrayMenuObject,(LPARAM)&tmi);

@@ -145,12 +145,12 @@ static INT_PTR AddTrayMenuItem(WPARAM wParam,LPARAM lParam)
 	return (INT_PTR)op.Handle;

 }

 

-INT_PTR TrayMenuCheckService(WPARAM wParam,LPARAM lParam) 

+INT_PTR TrayMenuCheckService(WPARAM wParam,LPARAM lParam)

 {

 	return 0;

 }

 

-INT_PTR TrayMenuonAddService(WPARAM wParam,LPARAM lParam) 

+INT_PTR TrayMenuonAddService(WPARAM wParam,LPARAM lParam)

 {

 	MENUITEMINFO *mii = (MENUITEMINFO* )wParam;

 	if (mii == NULL) return 0;

@@ -162,12 +162,12 @@ INT_PTR TrayMenuonAddService(WPARAM wParam,LPARAM lParam)
 

 	if (hTrayMainMenuItemProxy == (HANDLE)lParam) {

 		mii->fMask |= MIIM_SUBMENU;

-		mii->hSubMenu = (HMENU)CallService(MS_CLIST_MENUGETMAIN,0,0);		

+		mii->hSubMenu = (HMENU)CallService(MS_CLIST_MENUGETMAIN,0,0);

 	}

 

 	if (hTrayStatusMenuItemProxy == (HANDLE)lParam) {

 		mii->fMask |= MIIM_SUBMENU;

-		mii->hSubMenu = (HMENU)CallService(MS_CLIST_MENUGETSTATUS,0,0);		

+		mii->hSubMenu = (HMENU)CallService(MS_CLIST_MENUGETSTATUS,0,0);

 	}

 

 	return(TRUE);

@@ -180,13 +180,13 @@ INT_PTR TrayMenuonAddService(WPARAM wParam,LPARAM lParam)
 INT_PTR TrayMenuExecService(WPARAM wParam,LPARAM lParam) {

 	if (wParam != 0)

 	{

-		lpTrayMenuExecParam mmep = (lpTrayMenuExecParam)wParam;	

+		lpTrayMenuExecParam mmep = (lpTrayMenuExecParam)wParam;

 		if (!strcmp(mmep->szServiceName,"Help/AboutCommand"))

 		{

 			//bug in help.c,it used wparam as parent window handle without reason.

 			mmep->Param1 = 0;

 		}

-		CallService(mmep->szServiceName,mmep->Param1,lParam);	

+		CallService(mmep->szServiceName,mmep->Param1,lParam);

 	}

 	return(1);

 }

@@ -216,21 +216,21 @@ void InitTrayMenus(void)
 	tmp.ExecService = "CLISTMENUSTRAY/ExecService";

 	tmp.name = "TrayMenu";

 	hTrayMenuObject = (HANDLE)CallService(MO_CREATENEWMENUOBJECT,(WPARAM)0,(LPARAM)&tmp);

-	

+

 	CreateServiceFunction("CLISTMENUSTRAY/ExecService",TrayMenuExecService);

 	CreateServiceFunction("CLISTMENUSTRAY/FreeOwnerDataTrayMenu",FreeOwnerDataTrayMenu);

 	CreateServiceFunction("CLISTMENUSTRAY/TrayMenuonAddService",TrayMenuonAddService);

 

-	CreateServiceFunction(MS_CLIST_ADDTRAYMENUITEM,AddTrayMenuItem);

+	CreateServiceFunction("CList/AddTrayMenuItem",AddTrayMenuItem);

 	CreateServiceFunction(MS_CLIST_REMOVETRAYMENUITEM,RemoveTrayMenuItem);

 	CreateServiceFunction(MS_CLIST_MENUBUILDTRAY,BuildTrayMenu);

 	hPreBuildTrayMenuEvent = CreateHookableEvent(ME_CLIST_PREBUILDTRAYMENU);

-		

+

 	op.Handle = hTrayMenuObject;

 	op.Setting = OPT_USERDEFINEDITEMS;

 	op.Value = TRUE;

 	CallService(MO_SETOPTIONSMENUOBJECT,(WPARAM)0,(LPARAM)&op);

-	

+

 	op.Handle = hTrayMenuObject;

 	op.Setting = OPT_MENUOBJECT_SET_FREE_SERVICE;

 	op.Value = (INT_PTR)"CLISTMENUSTRAY/FreeOwnerDataTrayMenu";

@@ -241,7 +241,7 @@ void InitTrayMenus(void)
 	op.Value = (INT_PTR)"CLISTMENUSTRAY/TrayMenuonAddService";

 	CallService(MO_SETOPTIONSMENUOBJECT,(WPARAM)0,(LPARAM)&op);

 

-	{	

+	{

 		//add  exit command to menu

 		CLISTMENUITEM mi;

 

@@ -266,7 +266,7 @@ void InitTrayMenus(void)
 		mi.pszService = "FindAdd/FindAddCommand";

 		mi.pszName = LPGEN("&Find/Add Contacts...");

 		AddTrayMenuItem((WPARAM)0,(LPARAM)&mi);

-	

+

 		memset(&mi,0,sizeof(mi));

 		mi.cbSize = sizeof(mi);

 		mi.position = 300000;

diff --git a/plugins/Mwclist/groupmenu.cpp b/plugins/Mwclist/groupmenu.cpp
index 815b55274a..fab616f6fb 100644
--- a/plugins/Mwclist/groupmenu.cpp
+++ b/plugins/Mwclist/groupmenu.cpp
@@ -281,7 +281,7 @@ void InitGroupMenus(void)
 	CreateServiceFunction("CLISTMENUSGroup/UseGroupsHelper",UseGroupsHelper);

 	CreateServiceFunction("CLISTMENUSGroup/HideOfflineRootHelper",HideOfflineRootHelper);

 

-	CreateServiceFunction(MS_CLIST_ADDGROUPMENUITEM,AddGroupMenuItem);

+	CreateServiceFunction("CList/AddGroupMenuItem",AddGroupMenuItem);

 	CreateServiceFunction(MS_CLIST_REMOVEGROUPMENUITEM,RemoveGroupMenuItem);

 	CreateServiceFunction(MS_CLIST_MENUBUILDGROUP,BuildGroupMenu);

 	hPreBuildGroupMenuEvent = CreateHookableEvent(ME_CLIST_PREBUILDGROUPMENU);

@@ -598,7 +598,7 @@ void InitSubGroupMenus(void)
 	CreateServiceFunction("CLISTMENUSSubGroup/SubGroupMenuonAddService",SubGroupMenuonAddService);

 	CreateServiceFunction("CLISTMENUSSubGroup/GroupMenuExecProxy",GroupMenuExecProxy);

 

-	CreateServiceFunction(MS_CLIST_ADDSUBGROUPMENUITEM,AddSubGroupMenuItem);

+	CreateServiceFunction("CList/AddSubGroupMenuItem",AddSubGroupMenuItem);

 	CreateServiceFunction(MS_CLIST_REMOVESUBGROUPMENUITEM,RemoveSubGroupMenuItem);

 	CreateServiceFunction(MS_CLIST_MENUBUILDSUBGROUP,BuildSubGroupMenu);

 	hPreBuildSubGroupMenuEvent = CreateHookableEvent(ME_CLIST_PREBUILDSUBGROUPMENU);