From cf1c8283aca6d09ddfc42d18c8ecc38bbc0f65fb Mon Sep 17 00:00:00 2001 From: George Hazan Date: Tue, 16 Sep 2014 14:02:41 +0000 Subject: MS_CLIST_REMOVEMAINMENUITEM also removed git-svn-id: http://svn.miranda-ng.org/main/trunk@10480 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- include/delphi/m_genmenu.inc | 8 -------- include/m_genmenu.h | 6 ------ plugins/AddContactPlus/src/main.cpp | 2 +- plugins/BossKeyPlus/src/BossKey.cpp | 2 +- plugins/Clist_modern/src/CLUIFrames/cluiframes.cpp | 4 ++-- plugins/Clist_nicer/src/CLUIFrames/cluiframes.cpp | 2 +- plugins/ListeningTo/src/listeningto.cpp | 4 ++-- plugins/QuickSearch/sr_global.pas | 5 ++--- plugins/TrafficCounter/src/TrafficCounter.cpp | 2 +- plugins/TrafficCounter/src/options.cpp | 2 +- plugins/UserInfoEx/src/psp_options.cpp | 18 ++++++++---------- plugins/Watrack/lastfm/lastfm.pas | 2 +- plugins/Watrack/popup/popups.pas | 2 +- plugins/Watrack/stat/statlog.pas | 2 +- plugins/mRadio/i_tray.inc | 4 ++-- protocols/AimOscar/src/theme.cpp | 2 +- protocols/FacebookRM/src/theme.cpp | 2 +- protocols/Gadu-Gadu/src/gg.cpp | 2 +- protocols/Gadu-Gadu/src/gg_proto.cpp | 2 +- protocols/IRCG/src/ircproto.cpp | 2 +- protocols/IRCG/src/services.cpp | 2 +- protocols/JabberG/src/jabber_menu.cpp | 4 ++-- protocols/MSN/src/msn_menu.cpp | 2 +- protocols/Tlen/src/tlen.cpp | 14 -------------- protocols/Tlen/src/tlen.h | 1 - protocols/Tlen/src/tlen_svc.cpp | 1 - protocols/Xfire/src/Xfire_game.cpp | 2 +- protocols/Xfire/src/Xfire_gamelist.cpp | 2 +- protocols/Yahoo/src/services.cpp | 4 ++-- src/modules/clist/clistmenus.cpp | 12 ------------ 30 files changed, 37 insertions(+), 82 deletions(-) diff --git a/include/delphi/m_genmenu.inc b/include/delphi/m_genmenu.inc index 252f1acc73..8712927ab3 100644 --- a/include/delphi/m_genmenu.inc +++ b/include/delphi/m_genmenu.inc @@ -202,14 +202,6 @@ const } //!! MS_CLIST_ADDSTATUSMENUITEM = 'CList/AddStatusMenuItem'; // defined in m_clist.inc -{ - remove a item from main menu - wParam=hMenuItem returned by MS_CLIST_ADDMAINMENUITEM - lParam=0 - returns 0 on success, nonzero on failure -} - MS_CLIST_REMOVEMAINMENUITEM:PAnsiChar = 'CList/RemoveMainMenuItem'; - { builds the main menu wParam=lParam=0 diff --git a/include/m_genmenu.h b/include/m_genmenu.h index ed7896aaf6..8203811b53 100644 --- a/include/m_genmenu.h +++ b/include/m_genmenu.h @@ -186,12 +186,6 @@ __forceinline HGENMENU Menu_AddTrayMenuItem(CLISTMENUITEM *mi) //wParam=lParam=0 #define ME_CLIST_PREBUILDSTATUSMENU "CList/PreBuildStatusMenu" -//remove a item from main menu -//wParam=hMenuItem returned by MS_CLIST_ADDMAINMENUITEM -//lParam=0 -//returns 0 on success, nonzero on failure -#define MS_CLIST_REMOVEMAINMENUITEM "CList/RemoveMainMenuItem" - //builds the main menu //wParam=lParam=0 //returns a HMENU identifying the menu. diff --git a/plugins/AddContactPlus/src/main.cpp b/plugins/AddContactPlus/src/main.cpp index 2458b59076..df317a48c2 100644 --- a/plugins/AddContactPlus/src/main.cpp +++ b/plugins/AddContactPlus/src/main.cpp @@ -102,7 +102,7 @@ static int OnAccListChanged(WPARAM, LPARAM) if (!hMainMenuItem) return 0; - CallService(MS_CLIST_REMOVEMAINMENUITEM, (WPARAM)hMainMenuItem, 0); + CallService(MO_REMOVEMENUITEM, (WPARAM)hMainMenuItem, 0); CallService(MS_TTB_REMOVEBUTTON, (WPARAM)hToolBarItem, 0); hMainMenuItem = 0; } diff --git a/plugins/BossKeyPlus/src/BossKey.cpp b/plugins/BossKeyPlus/src/BossKey.cpp index 3be8c1a081..fa3cdf2e41 100644 --- a/plugins/BossKeyPlus/src/BossKey.cpp +++ b/plugins/BossKeyPlus/src/BossKey.cpp @@ -562,7 +562,7 @@ void BossKeyMenuItemInit(void) // Add menu item void BossKeyMenuItemUnInit(void) // Remove menu item { - CallService(MS_CLIST_REMOVEMAINMENUITEM, (WPARAM)g_hMenuItem, 0); + CallService(MO_REMOVEMENUITEM, (WPARAM)g_hMenuItem, 0); g_hMenuItem = 0; } diff --git a/plugins/Clist_modern/src/CLUIFrames/cluiframes.cpp b/plugins/Clist_modern/src/CLUIFrames/cluiframes.cpp index a4acecf17e..599a4f9d88 100644 --- a/plugins/Clist_modern/src/CLUIFrames/cluiframes.cpp +++ b/plugins/Clist_modern/src/CLUIFrames/cluiframes.cpp @@ -1706,7 +1706,7 @@ static int CLUIFramesLoadMainMenu() return -1; if (_hmiRoot != HGENMENU_ROOT) { - CallService(MS_CLIST_REMOVEMAINMENUITEM, (WPARAM)_hmiRoot, 0); + CallService(MO_REMOVEMENUITEM, (WPARAM)_hmiRoot, 0); _hmiRoot = HGENMENU_ROOT; } @@ -3870,7 +3870,7 @@ static INT_PTR UnloadMainMenu() { CLUIFrameOnModulesUnload(0, 0); if (_hmiRoot != HGENMENU_ROOT) { - CallService(MS_CLIST_REMOVEMAINMENUITEM, (WPARAM)_hmiRoot, 0); + CallService(MO_REMOVEMENUITEM, (WPARAM)_hmiRoot, 0); _hmiRoot = HGENMENU_ROOT; } diff --git a/plugins/Clist_nicer/src/CLUIFrames/cluiframes.cpp b/plugins/Clist_nicer/src/CLUIFrames/cluiframes.cpp index f850e92d61..6fe8fffc31 100644 --- a/plugins/Clist_nicer/src/CLUIFrames/cluiframes.cpp +++ b/plugins/Clist_nicer/src/CLUIFrames/cluiframes.cpp @@ -1473,7 +1473,7 @@ static int CLUIFramesLoadMainMenu() return -1; if (MainMIRoot != (HANDLE)-1) { - CallService(MS_CLIST_REMOVEMAINMENUITEM, (WPARAM)MainMIRoot, 0); + CallService(MO_REMOVEMENUITEM, (WPARAM)MainMIRoot, 0); MainMIRoot = (HGENMENU)-1; } diff --git a/plugins/ListeningTo/src/listeningto.cpp b/plugins/ListeningTo/src/listeningto.cpp index 7dcceb47b1..f6fd9214c7 100644 --- a/plugins/ListeningTo/src/listeningto.cpp +++ b/plugins/ListeningTo/src/listeningto.cpp @@ -188,7 +188,7 @@ void RebuildMenu() ProtocolInfo *info = &proto_items[i]; if (info->hMenu != NULL) - CallService(MS_CLIST_REMOVEMAINMENUITEM, (WPARAM) info->hMenu, 0); + CallService(MO_REMOVEMENUITEM, (WPARAM) info->hMenu, 0); TCHAR text[512]; mir_sntprintf(text, SIZEOF(text), TranslateT("Send to %s"), info->account); @@ -252,7 +252,7 @@ int AccListChanged(WPARAM wParam, LPARAM lParam) } else if (wParam == PRAC_REMOVED || (wParam == PRAC_CHECKED && !proto->bIsEnabled)) { - CallService(MS_CLIST_REMOVEMAINMENUITEM, (WPARAM) info->hMenu, 0); + CallService(MO_REMOVEMENUITEM, (WPARAM) info->hMenu, 0); for(std::vector::iterator it = proto_items.begin(); it != proto_items.end(); ++it) { diff --git a/plugins/QuickSearch/sr_global.pas b/plugins/QuickSearch/sr_global.pas index 41d8eaa368..955c18e692 100644 --- a/plugins/QuickSearch/sr_global.pas +++ b/plugins/QuickSearch/sr_global.pas @@ -264,10 +264,9 @@ begin begin { - if (MainMenuItem<>0) and - (ServiceExists(MS_CLIST_REMOVEMAINMENUITEM)<>0) then + if (MainMenuItem<>0) then begin - CallService(MS_CLIST_REMOVEMAINMENUITEM,MainMenuItem,0); + CallService(MO_REMOVEMENUITEM,MainMenuItem,0); MainMenuItem:=0; end; } diff --git a/plugins/TrafficCounter/src/TrafficCounter.cpp b/plugins/TrafficCounter/src/TrafficCounter.cpp index 9db8c5dd71..342a5557a9 100644 --- a/plugins/TrafficCounter/src/TrafficCounter.cpp +++ b/plugins/TrafficCounter/src/TrafficCounter.cpp @@ -158,7 +158,7 @@ int TrafficCounterShutdown(WPARAM wParam, LPARAM lParam) // Удаляем пункт главного меню. if (hTrafficMainMenuItem) { - CallService(MS_CLIST_REMOVEMAINMENUITEM, (WPARAM)hTrafficMainMenuItem, 0); + CallService(MO_REMOVEMENUITEM, (WPARAM)hTrafficMainMenuItem, 0); hTrafficMainMenuItem = NULL; } // Удаляем контекстное меню. diff --git a/plugins/TrafficCounter/src/options.cpp b/plugins/TrafficCounter/src/options.cpp index f545961c02..d01ac44276 100644 --- a/plugins/TrafficCounter/src/options.cpp +++ b/plugins/TrafficCounter/src/options.cpp @@ -324,7 +324,7 @@ static INT_PTR CALLBACK DlgProcTCOptions(HWND hwndDlg, UINT msg, WPARAM wParam, // Если отключается показ пункта главного меню, то удаляем его. if (!unOptions.ShowMainMenuItem && hTrafficMainMenuItem) { - CallService(MS_CLIST_REMOVEMAINMENUITEM, (WPARAM)hTrafficMainMenuItem, 0); + CallService(MO_REMOVEMENUITEM, (WPARAM)hTrafficMainMenuItem, 0); hTrafficMainMenuItem = NULL; } // Если включается, то создаём. diff --git a/plugins/UserInfoEx/src/psp_options.cpp b/plugins/UserInfoEx/src/psp_options.cpp index dc9d584a11..5db6f1418c 100644 --- a/plugins/UserInfoEx/src/psp_options.cpp +++ b/plugins/UserInfoEx/src/psp_options.cpp @@ -359,19 +359,17 @@ static INT_PTR CALLBACK DlgProc_CommonOpts(HWND hDlg, UINT uMsg, WPARAM wParam, case CHECK_OPT_MI_GROUP: case CHECK_OPT_MI_SUBGROUP: case CHECK_OPT_MI_ACCOUNT: - { - for (int i = 0; i < SIZEOF(ctrl_Menu); i++) { - if (ctrl_Menu[i].idCheckbox == LOWORD(wParam)) { - const int idMenuItems[] = { ctrl_Menu[i].idCheckbox + 1, ctrl_Menu[i].idNONE, ctrl_Menu[i].idALL, ctrl_Menu[i].idEXIMPORT }; - EnableControls(hDlg, idMenuItems, SIZEOF(idMenuItems), - Button_GetCheck((HWND)lParam) && ServiceExists(MS_CLIST_REMOVEMAINMENUITEM)); - break; - } + for (int i = 0; i < SIZEOF(ctrl_Menu); i++) { + if (ctrl_Menu[i].idCheckbox == LOWORD(wParam)) { + const int idMenuItems[] = { ctrl_Menu[i].idCheckbox + 1, ctrl_Menu[i].idNONE, ctrl_Menu[i].idALL, ctrl_Menu[i].idEXIMPORT }; + EnableControls(hDlg, idMenuItems, SIZEOF(idMenuItems), Button_GetCheck((HWND)lParam)); + break; } - if (bInitialized) - NotifyParentOfChange(hDlg); } + if (bInitialized) + NotifyParentOfChange(hDlg); break; + case RADIO_OPT_MI_MAIN_ALL: case RADIO_OPT_MI_MAIN_NONE: case RADIO_OPT_MI_MAIN_EXIMPORT: diff --git a/plugins/Watrack/lastfm/lastfm.pas b/plugins/Watrack/lastfm/lastfm.pas index 6d50b68d14..ee552cc00e 100644 --- a/plugins/Watrack/lastfm/lastfm.pas +++ b/plugins/Watrack/lastfm/lastfm.pas @@ -261,7 +261,7 @@ begin else DestroyServiceFunction(slastinf); - CallService(MS_CLIST_REMOVEMAINMENUITEM,hMenuLast,0); + CallService(MO_REMOVEMENUITEM,hMenuLast,0); hMenuLast:=0; DestroyServiceFunction(slast); UnhookEvent(plStatusHook); diff --git a/plugins/Watrack/popup/popups.pas b/plugins/Watrack/popup/popups.pas index 67ac946579..212409324e 100644 --- a/plugins/Watrack/popup/popups.pas +++ b/plugins/Watrack/popup/popups.pas @@ -540,7 +540,7 @@ begin if aSetDisable then SetModStatus(0); - CallService(MS_CLIST_REMOVEMAINMENUITEM,hMenuInfo,0); + CallService(MO_REMOVEMENUITEM,hMenuInfo,0); UnhookEvent(plStatusHook); DestroyServiceFunction(ssmi); UnhookEvent(sic); diff --git a/plugins/Watrack/stat/statlog.pas b/plugins/Watrack/stat/statlog.pas index d5a0318a69..5ff486747c 100644 --- a/plugins/Watrack/stat/statlog.pas +++ b/plugins/Watrack/stat/statlog.pas @@ -615,7 +615,7 @@ begin if aSetDisable then SetModStatus(0); - CallService(MS_CLIST_REMOVEMAINMENUITEM,hMenuReport,0); + CallService(MO_REMOVEMENUITEM,hMenuReport,0); UnhookEvent(plStatusHook); UnhookEvent(sic); DestroyServiceFunction(hPackLog); diff --git a/plugins/mRadio/i_tray.inc b/plugins/mRadio/i_tray.inc index 103865ffe5..02d1ae5fd8 100644 --- a/plugins/mRadio/i_tray.inc +++ b/plugins/mRadio/i_tray.inc @@ -85,7 +85,7 @@ begin if doTray then CallService(MS_CLIST_REMOVETRAYMENUITEM,tmp.menuitem,0) else - CallService(MS_CLIST_REMOVEMAINMENUITEM,tmp.menuitem,0); + CallService(MO_REMOVEMENUITEM,tmp.menuitem,0); mFreeMem(tmp); List_Remove(@trayStations,i); end; @@ -317,5 +317,5 @@ begin if doTray then CallService(MS_CLIST_REMOVETRAYMENUITEM,trayradioparent,0) else - CallService(MS_CLIST_REMOVEMAINMENUITEM,trayradioparent,0); + CallService(MO_REMOVEMENUITEM,trayradioparent,0); end; diff --git a/protocols/AimOscar/src/theme.cpp b/protocols/AimOscar/src/theme.cpp index 1710d8b2b2..baacf678f0 100644 --- a/protocols/AimOscar/src/theme.cpp +++ b/protocols/AimOscar/src/theme.cpp @@ -312,7 +312,7 @@ void CAimProto::InitContactMenus(void) void CAimProto::RemoveMainMenus(void) { if (hMenuRoot) - CallService(MS_CLIST_REMOVEMAINMENUITEM, (WPARAM)hMenuRoot, 0); + CallService(MO_REMOVEMENUITEM, (WPARAM)hMenuRoot, 0); } void CAimProto::RemoveContactMenus(void) diff --git a/protocols/FacebookRM/src/theme.cpp b/protocols/FacebookRM/src/theme.cpp index 64d5cc9f6e..8bc989036d 100644 --- a/protocols/FacebookRM/src/theme.cpp +++ b/protocols/FacebookRM/src/theme.cpp @@ -215,7 +215,7 @@ int FacebookProto::OnBuildStatusMenu(WPARAM wParam,LPARAM lParam) } else { if (m_hMenuRoot) - CallService(MS_CLIST_REMOVEMAINMENUITEM, (WPARAM)m_hMenuRoot, 0); + CallService(MO_REMOVEMENUITEM, (WPARAM)m_hMenuRoot, 0); m_hMenuRoot = NULL; } diff --git a/protocols/Gadu-Gadu/src/gg.cpp b/protocols/Gadu-Gadu/src/gg.cpp index e1b9f75a61..a7fd0a3fa9 100644 --- a/protocols/Gadu-Gadu/src/gg.cpp +++ b/protocols/Gadu-Gadu/src/gg.cpp @@ -297,7 +297,7 @@ void GGPROTO::menus_init() hCLRoot = Menu_AddProtoMenuItem(&mi); if (hMenuRoot) - CallService(MS_CLIST_REMOVEMAINMENUITEM, (WPARAM)hMenuRoot, 0); + CallService(MO_REMOVEMENUITEM, (WPARAM)hMenuRoot, 0); hMenuRoot = NULL; } diff --git a/protocols/Gadu-Gadu/src/gg_proto.cpp b/protocols/Gadu-Gadu/src/gg_proto.cpp index 5b6b7f43c4..4b06361a18 100644 --- a/protocols/Gadu-Gadu/src/gg_proto.cpp +++ b/protocols/Gadu-Gadu/src/gg_proto.cpp @@ -96,7 +96,7 @@ GGPROTO::~GGPROTO() Popup_UnregisterClass(hPopupNotify); if (hMenuRoot) - CallService(MS_CLIST_REMOVEMAINMENUITEM, (WPARAM)hMenuRoot, 0); + CallService(MO_REMOVEMENUITEM, (WPARAM)hMenuRoot, 0); // Close handles Netlib_CloseHandle(m_hNetlibUser); diff --git a/protocols/IRCG/src/ircproto.cpp b/protocols/IRCG/src/ircproto.cpp index 8b036c14c8..2cb0fda304 100644 --- a/protocols/IRCG/src/ircproto.cpp +++ b/protocols/IRCG/src/ircproto.cpp @@ -149,7 +149,7 @@ CIrcProto::~CIrcProto() Netlib_CloseHandle(hNetlibDCC); hNetlibDCC = NULL; if (hMenuRoot) - CallService(MS_CLIST_REMOVEMAINMENUITEM, (WPARAM)hMenuRoot, 0); + CallService(MO_REMOVEMENUITEM, (WPARAM)hMenuRoot, 0); mir_free(m_alias); diff --git a/protocols/IRCG/src/services.cpp b/protocols/IRCG/src/services.cpp index e31a1ac7c9..7579f1775e 100644 --- a/protocols/IRCG/src/services.cpp +++ b/protocols/IRCG/src/services.cpp @@ -41,7 +41,7 @@ void CIrcProto::InitMainMenus(void) } else { if (hMenuRoot) - CallService(MS_CLIST_REMOVEMAINMENUITEM, (WPARAM)hMenuRoot, 0); + CallService(MO_REMOVEMENUITEM, (WPARAM)hMenuRoot, 0); hMenuRoot = NULL; } diff --git a/protocols/JabberG/src/jabber_menu.cpp b/protocols/JabberG/src/jabber_menu.cpp index 986fd97a67..321bb28a79 100644 --- a/protocols/JabberG/src/jabber_menu.cpp +++ b/protocols/JabberG/src/jabber_menu.cpp @@ -619,7 +619,7 @@ void CJabberProto::MenuInit() } else { if (m_hMenuRoot) - CallService(MS_CLIST_REMOVEMAINMENUITEM, (WPARAM)m_hMenuRoot, 0); + CallService(MO_REMOVEMENUITEM, (WPARAM)m_hMenuRoot, 0); m_hMenuRoot = NULL; } @@ -919,7 +919,7 @@ void CJabberProto::GlobalMenuUninit() m_nMenuResourceItems = 0; if (m_hMenuRoot) - CallService(MS_CLIST_REMOVEMAINMENUITEM, (WPARAM)m_hMenuRoot, 0); + CallService(MO_REMOVEMENUITEM, (WPARAM)m_hMenuRoot, 0); m_hMenuRoot = NULL; } diff --git a/protocols/MSN/src/msn_menu.cpp b/protocols/MSN/src/msn_menu.cpp index 49f6e6201d..84ef664f0f 100644 --- a/protocols/MSN/src/msn_menu.cpp +++ b/protocols/MSN/src/msn_menu.cpp @@ -329,7 +329,7 @@ void CMsnProto::MsnInitMainMenu(void) void CMsnProto::MsnRemoveMainMenus(void) { if (mainMenuRoot) - CallService(MS_CLIST_REMOVEMAINMENUITEM, (WPARAM)mainMenuRoot, 0); + CallService(MO_REMOVEMENUITEM, (WPARAM)mainMenuRoot, 0); } void CMsnProto::MSN_EnableMenuItems(bool bEnable) diff --git a/protocols/Tlen/src/tlen.cpp b/protocols/Tlen/src/tlen.cpp index 92d7e4f813..9897d5b873 100644 --- a/protocols/Tlen/src/tlen.cpp +++ b/protocols/Tlen/src/tlen.cpp @@ -345,20 +345,6 @@ void TlenProtocol::initMenuItems() hMenuContactGrantAuth = Menu_AddContactMenuItem(&mi); } -void uninitMenuItems(TlenProtocol *proto) -{ - CallService(MS_CLIST_REMOVEMAINMENUITEM, (WPARAM)proto->hMenuChats, (LPARAM) 0); - 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(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) { TlenProtocol* ppro = new TlenProtocol( pszProtoName, tszUserName ); diff --git a/protocols/Tlen/src/tlen.h b/protocols/Tlen/src/tlen.h index 652e706348..e877986253 100644 --- a/protocols/Tlen/src/tlen.h +++ b/protocols/Tlen/src/tlen.h @@ -445,7 +445,6 @@ extern HANDLE hMainThread; /******************************************************************* * Function declarations *******************************************************************/ -void uninitMenuItems(TlenProtocol *proto); HICON GetIcolibIcon(int iconId); void ReleaseIcolibIcon(HICON hIcon); diff --git a/protocols/Tlen/src/tlen_svc.cpp b/protocols/Tlen/src/tlen_svc.cpp index 53b657bc1e..003ec84619 100644 --- a/protocols/Tlen/src/tlen_svc.cpp +++ b/protocols/Tlen/src/tlen_svc.cpp @@ -1273,7 +1273,6 @@ TlenProtocol::TlenProtocol( const char *aProtoName, const TCHAR *aUserName) : TlenProtocol::~TlenProtocol() { - uninitMenuItems(this); TlenVoiceCancelAll(this); TlenFileCancelAll(this); if (hTlenNudge) diff --git a/protocols/Xfire/src/Xfire_game.cpp b/protocols/Xfire/src/Xfire_game.cpp index 30ec9c86b3..b41fc14143 100644 --- a/protocols/Xfire/src/Xfire_game.cpp +++ b/protocols/Xfire/src/Xfire_game.cpp @@ -460,7 +460,7 @@ void Xfire_game::remoteMenuitem() { if (menuhandle!=NULL) { - CallService(MS_CLIST_REMOVEMAINMENUITEM, ( WPARAM )menuhandle, 0 ); + CallService(MO_REMOVEMENUITEM, (WPARAM)menuhandle, 0 ); menuhandle=NULL; } } diff --git a/protocols/Xfire/src/Xfire_gamelist.cpp b/protocols/Xfire/src/Xfire_gamelist.cpp index 0a5ac9cfaa..cf028c358a 100644 --- a/protocols/Xfire/src/Xfire_gamelist.cpp +++ b/protocols/Xfire/src/Xfire_gamelist.cpp @@ -259,7 +259,7 @@ void Xfire_gamelist::createDummyMenuItem() //entfernt dummymenueintrag void Xfire_gamelist::removeDummyMenuItem() { - CallService(MS_CLIST_REMOVEMAINMENUITEM, ( WPARAM )dummymenuitem, 0 ); + CallService(MO_REMOVEMENUITEM, (WPARAM)dummymenuitem, 0 ); } //sдubert die datenbank spiel eintrдge udn trдgt custom spiele vorher nach diff --git a/protocols/Yahoo/src/services.cpp b/protocols/Yahoo/src/services.cpp index 7b8b30f2e5..f334bd517d 100644 --- a/protocols/Yahoo/src/services.cpp +++ b/protocols/Yahoo/src/services.cpp @@ -383,7 +383,7 @@ void CYahooProto::MenuMainInit( void ) } else { if (mainMenuRoot) - CallService(MS_CLIST_REMOVEMAINMENUITEM, (WPARAM)mainMenuRoot, 0); + CallService(MO_REMOVEMENUITEM, (WPARAM)mainMenuRoot, 0); mainMenuRoot = NULL; } @@ -488,7 +488,7 @@ void CYahooProto::MenuContactInit( void ) void CYahooProto::MenuUninit( void ) { if ( mainMenuRoot ) - CallService(MS_CLIST_REMOVEMAINMENUITEM, (WPARAM)mainMenuRoot, 0); + CallService(MO_REMOVEMENUITEM, (WPARAM)mainMenuRoot, 0); CallService(MO_REMOVEMENUITEM, (WPARAM)hShowProfileMenuItem, 0); } diff --git a/src/modules/clist/clistmenus.cpp b/src/modules/clist/clistmenus.cpp index 6e92577cc7..0a522dc9d2 100644 --- a/src/modules/clist/clistmenus.cpp +++ b/src/modules/clist/clistmenus.cpp @@ -181,17 +181,6 @@ int fnGetAverageMode(int *pNetProtoCount) ///////////////////////////////////////////////////////////////////////////////////////// // MAIN MENU -/* -wparam=handle to the menu item returned by MS_CLIST_ADDCONTACTMENUITEM -return 0 on success. -*/ - -static INT_PTR RemoveMainMenuItem(WPARAM wParam, LPARAM) -{ - CallService(MO_REMOVEMENUITEM, wParam, 0); - return 0; -} - static INT_PTR BuildMainMenu(WPARAM, LPARAM) { ListParam param = { 0 }; @@ -1276,7 +1265,6 @@ void InitCustomMenus(void) CreateServiceFunction("CList/AddMainMenuItem", AddMainMenuItem); CreateServiceFunction("CList/AddStatusMenuItem", AddStatusMenuItem); CreateServiceFunction(MS_CLIST_MENUGETMAIN, MenuGetMain); - CreateServiceFunction(MS_CLIST_REMOVEMAINMENUITEM, RemoveMainMenuItem); CreateServiceFunction(MS_CLIST_MENUBUILDMAIN, BuildMainMenu); CreateServiceFunction("CList/AddContactMenuItem", AddContactMenuItem); -- cgit v1.2.3