EV_PROTO_ONMENU removed

3 files changed, 4 insertions, 35 deletions

diff --git a/protocols/MSN/src/msn_menu.cpp b/protocols/MSN/src/msn_menu.cpp
index 43b1edfe27..56d1b474af 100644
--- a/protocols/MSN/src/msn_menu.cpp
+++ b/protocols/MSN/src/msn_menu.cpp
@@ -139,7 +139,7 @@ int CMsnProto::OnContactDoubleClicked(WPARAM hContact, LPARAM)
 }

 

 // Menus initialization

-void CMsnProto::MsnInitMainMenu(void)

+void CMsnProto::OnBuildProtoMenu(void)

 {

 	CMenuItem mi;

 	mi.root = Menu_GetProtocolRoot(this);

diff --git a/protocols/MSN/src/msn_proto.cpp b/protocols/MSN/src/msn_proto.cpp
index 3b088aaf66..276d1e7af2 100644
--- a/protocols/MSN/src/msn_proto.cpp
+++ b/protocols/MSN/src/msn_proto.cpp
@@ -954,13 +954,9 @@ int CMsnProto::SetApparentMode(MCONTACT hContact, int mode)
 	return 1;

 }

 

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

+int CMsnProto::OnEvent(PROTOEVENTTYPE eventType, WPARAM, LPARAM)

 {

 	switch (eventType) {

-	case EV_PROTO_ONMENU:

-		MsnInitMainMenu();

-		break;

-

 	case EV_PROTO_ONERASE:

 		char szDbsettings[64];

 		mir_snprintf(szDbsettings, "%s_HTTPS", m_szModuleName);

diff --git a/protocols/MSN/src/msn_proto.h b/protocols/MSN/src/msn_proto.h
index f64f2da3c7..20674b0986 100644
--- a/protocols/MSN/src/msn_proto.h
+++ b/protocols/MSN/src/msn_proto.h
@@ -67,6 +67,7 @@ struct CMsnProto : public PROTO<CMsnProto>
 

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

 

+	void     OnBuildProtoMenu(void) override;

 	void     OnContactDeleted(MCONTACT) override;

 	void     OnModulesLoaded() override;

 	void     OnShutdown() override;

@@ -222,19 +223,10 @@ struct CMsnProto : public PROTO<CMsnProto>
 	void __cdecl msn_storeProfileThread(void*);

 

 	/////////////////////////////////////////////////////////////////////////////////////////

-	// MSN Connection properties detection

-

-	void		DecryptEchoPacket(UDPProbePkt& pkt);

-	void		MSNatDetect(void);

-

-	void __cdecl MSNConnDetectThread(void*);

-

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

 	// MSN menus

 

 	HGENMENU menuItemsMain[4];

 

-	void MsnInitMainMenu(void);

 	void MSN_EnableMenuItems(bool parEnable);

 	void MsnInvokeMyURL(bool ismail, const char* url);

 

@@ -262,12 +254,6 @@ struct CMsnProto : public PROTO<CMsnProto>
 

 	void __cdecl MsnGetAwayMsgThread(void* arg);

 

-	void __cdecl p2p_sendFeedThread(void* arg);

-	void __cdecl p2p_fileActiveThread(void* arg);

-	void __cdecl p2p_filePassiveThread(void* arg);

-

-	void __cdecl MsgQueue_AllClearThread(void* arg);

-

 	/////////////////////////////////////////////////////////////////////////////////////////

 	// MSN thread support

 

@@ -279,19 +265,6 @@ struct CMsnProto : public PROTO<CMsnProto>
 	void __cdecl ThreadStub(void* arg);

 

 	/////////////////////////////////////////////////////////////////////////////////////////

-	// MSN message queue support

-

-	int         MsgQueue_Add(const char* wlid, int msgType, const char* msg, int msglen, filetransfer* ft = nullptr, int flags = 0, STRLIST *cnt = nullptr);

-	const char* MsgQueue_CheckContact(const char* wlid, time_t tsc = 0);

-	const char* MsgQueue_GetNextRecipient(void);

-	bool        MsgQueue_GetNext(const char* wlid, MsgQueueEntry& retVal);

-	int         MsgQueue_NumMsg(const char* wlid);

-	void        MsgQueue_Clear(const char* wlid = nullptr, bool msg = false);

-

-	void MsgQueue_Init(void);

-	void MsgQueue_Uninit(void);

-

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

 	// MSN message reassembly support

 

 	OBJLIST<chunkedmsg> msgCache;

@@ -311,7 +284,7 @@ struct CMsnProto : public PROTO<CMsnProto>
 	void MSN_KillChatSession(const wchar_t* id);

 	void MSN_Kickuser(GCHOOK *gch);

 	void MSN_Promoteuser(GCHOOK *gch, const char *pszRole);

-	const wchar_t *MSN_GCGetRole(GCThreadData* thread, const char *pszWLID);

+	const wchar_t* MSN_GCGetRole(GCThreadData* thread, const char *pszWLID);

 	void MSN_GCProcessThreadActivity(ezxml_t xmli, const wchar_t *mChatID);

 	void MSN_GCAddMessage(wchar_t *mChatID, MCONTACT hContact, char *email, time_t ts, bool sentMsg, char *msgBody);

 	void MSN_GCRefreshThreadsInfo(void);