MS_CLIST_REMOVEMAINMENUITEM also removed

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

14 files changed, 13 insertions, 29 deletions

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);

 }