EV_PROTO_ONMENU removed

3 files changed, 2 insertions, 16 deletions

diff --git a/protocols/JabberG/src/jabber_menu.cpp b/protocols/JabberG/src/jabber_menu.cpp
index a18c7f1152..272c3504d9 100644
--- a/protocols/JabberG/src/jabber_menu.cpp
+++ b/protocols/JabberG/src/jabber_menu.cpp
@@ -528,7 +528,7 @@ INT_PTR __cdecl CJabberProto::OnMenuBookmarkAdd(WPARAM hContact, LPARAM)
 /////////////////////////////////////////////////////////////////////////////////////////

 // status menu

 

-void CJabberProto::MenuInit()

+void CJabberProto::OnBuildProtoMenu()

 {

 	CMenuItem mi;

 	mi.root = m_hMenuRoot = Menu_GetProtocolRoot(this);

diff --git a/protocols/JabberG/src/jabber_proto.cpp b/protocols/JabberG/src/jabber_proto.cpp
index 9a29ec47be..b41f475ec4 100755
--- a/protocols/JabberG/src/jabber_proto.cpp
+++ b/protocols/JabberG/src/jabber_proto.cpp
@@ -1320,16 +1320,3 @@ void CJabberProto::InfoFrame_OnTransport(CJabberInfoFrame_Event *evt)
 		Clist_MenuProcessCommand(res, MPCF_CONTACTMENU, hContact);

 	}

 }

-

-/////////////////////////////////////////////////////////////////////////////////////////

-// OnEvent - maintain protocol events

-

-int CJabberProto::OnEvent(PROTOEVENTTYPE eventType, WPARAM wParam, LPARAM lParam)

-{

-	switch (eventType) {

-	case EV_PROTO_ONMENU:

-		MenuInit();

-		break;

-	}

-	return 1;

-}

diff --git a/protocols/JabberG/src/jabber_proto.h b/protocols/JabberG/src/jabber_proto.h
index f63750259d..c36553e268 100755
--- a/protocols/JabberG/src/jabber_proto.h
+++ b/protocols/JabberG/src/jabber_proto.h
@@ -110,7 +110,7 @@ struct CJabberProto : public PROTO<CJabberProto>, public IJabberInterface
 

 	int      UserIsTyping(MCONTACT hContact, int type) override;

 

-	int      OnEvent(PROTOEVENTTYPE eventType, WPARAM wParam, LPARAM lParam) override;

+	void     OnBuildProtoMenu(void) override;

 	void     OnContactDeleted(MCONTACT) override;

 	void     OnModulesLoaded() override;

 	void     OnShutdown() override;

@@ -632,7 +632,6 @@ struct CJabberProto : public PROTO<CJabberProto>, public IJabberInterface
 	void   GlobalMenuInit(void);

 	void   GlobalMenuUninit(void);

 

-	void   MenuInit(void);

 	void   MenuUpdateSrmmIcon(JABBER_LIST_ITEM *item);

 

 	void   BuildPriorityMenu(void);