EV_PROTO_ONMENU removed

3 files changed, 2 insertions, 15 deletions

diff --git a/protocols/SkypeWeb/src/skype_menus.cpp b/protocols/SkypeWeb/src/skype_menus.cpp
index 5811ab33da..079d36e38b 100644
--- a/protocols/SkypeWeb/src/skype_menus.cpp
+++ b/protocols/SkypeWeb/src/skype_menus.cpp
@@ -86,7 +86,7 @@ void CSkypeProto::InitMenus()
 	CreateServiceFunction(mi.pszService, GlobalService<&CSkypeProto::UnblockContact>);

 }

 

-int CSkypeProto::OnInitStatusMenu()

+void CSkypeProto::OnBuildProtoMenu()

 {

 	CMenuItem mi;

 	mi.root = Menu_GetProtocolRoot(this);

@@ -97,5 +97,4 @@ int CSkypeProto::OnInitStatusMenu()
 	mi.position = SMI_POSITION + SMI_CREATECHAT;

 	mi.hIcolibItem = GetIconHandle(IDI_CONFERENCE);

 	Menu_AddProtoMenuItem(&mi, m_szModuleName);

-	return 0;

 }

diff --git a/protocols/SkypeWeb/src/skype_proto.cpp b/protocols/SkypeWeb/src/skype_proto.cpp
index cd5baa7bc0..fe1b897aa1 100644
--- a/protocols/SkypeWeb/src/skype_proto.cpp
+++ b/protocols/SkypeWeb/src/skype_proto.cpp
@@ -298,16 +298,6 @@ int CSkypeProto::UserIsTyping(MCONTACT hContact, int type)
 	return 0;
 }
 
-int CSkypeProto::OnEvent(PROTOEVENTTYPE iEventType, WPARAM wParam, LPARAM lParam)
-{
-	switch (iEventType) {
-	case EV_PROTO_ONMENU:
-		return OnInitStatusMenu();
-	}
-
-	return 1;
-}
-
 int CSkypeProto::RecvContacts(MCONTACT hContact, PROTORECVEVENT* pre)
 {
 	PROTOSEARCHRESULT **isrList = (PROTOSEARCHRESULT**)pre->szMessage;
diff --git a/protocols/SkypeWeb/src/skype_proto.h b/protocols/SkypeWeb/src/skype_proto.h
index b9c9d96f4a..bf704b4325 100644
--- a/protocols/SkypeWeb/src/skype_proto.h
+++ b/protocols/SkypeWeb/src/skype_proto.h
@@ -54,7 +54,7 @@ public:
 	HANDLE   GetAwayMsg(MCONTACT hContact) override;

 	int      SetAwayMsg(int m_iStatus, const wchar_t *msg) override;

 

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

+	void     OnBuildProtoMenu(void) override;

 	void     OnContactDeleted(MCONTACT) override;

 	void     OnModulesLoaded() override;

 	void     OnShutdown() override;

@@ -209,8 +209,6 @@ private:
 	int OnPrebuildContactMenu(WPARAM hContact, LPARAM);

 	static int PrebuildContactMenu(WPARAM hContact, LPARAM lParam);

 

-	int OnInitStatusMenu();

-

 	// options

 	int __cdecl OnOptionsInit(WPARAM wParam, LPARAM lParam);