From 8cbf63303a7f35241fa1ba2bd4ca8306e81d1837 Mon Sep 17 00:00:00 2001 From: George Hazan 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 --- include/delphi/m_genmenu.inc | 9 --------- include/m_genmenu.h | 10 ---------- plugins/MenuItemEx/src/main.cpp | 2 +- plugins/Quotes/src/Forex.cpp | 2 +- plugins/SmileyAdd/src/services.cpp | 4 ++-- plugins/UserInfoEx/src/svc_email.cpp | 2 +- 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 +- src/modules/clist/clistmenus.cpp | 7 ------- src/modules/clist/movetogroup.cpp | 2 +- 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(h),0); + return CallService(MO_REMOVEMENUITEM, reinterpret_cast(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; ihMenuMUC, (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