From 9300399ed59f4d82f5e62f5ef43b752da4dd0735 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sun, 22 Apr 2018 14:34:57 +0300 Subject: EV_PROTO_ONMENU removed --- include/m_protoint.h | 2 +- libs/win32/mir_app.lib | Bin 158140 -> 158470 bytes libs/win64/mir_app.lib | Bin 153170 -> 153506 bytes protocols/FacebookRM/src/proto.cpp | 13 ------------- protocols/FacebookRM/src/proto.h | 4 +--- protocols/FacebookRM/src/theme.cpp | 2 +- protocols/Gadu-Gadu/src/gg.cpp | 2 +- protocols/Gadu-Gadu/src/gg_proto.cpp | 11 ----------- protocols/Gadu-Gadu/src/gg_proto.h | 3 +-- protocols/IRCG/src/ircproto.cpp | 13 ------------- protocols/IRCG/src/ircproto.h | 4 +--- protocols/IRCG/src/services.cpp | 2 +- protocols/JabberG/src/jabber_menu.cpp | 2 +- protocols/JabberG/src/jabber_proto.cpp | 13 ------------- protocols/JabberG/src/jabber_proto.h | 3 +-- protocols/MRA/src/MraIcons.cpp | 7 +++++++ protocols/MRA/src/MraProto.cpp | 10 ---------- protocols/MRA/src/MraProto.h | 2 +- protocols/MSN/src/msn_menu.cpp | 2 +- protocols/MSN/src/msn_proto.cpp | 6 +----- protocols/MSN/src/msn_proto.h | 31 ++----------------------------- protocols/SkypeWeb/src/skype_menus.cpp | 3 +-- protocols/SkypeWeb/src/skype_proto.cpp | 10 ---------- protocols/SkypeWeb/src/skype_proto.h | 4 +--- protocols/Tox/src/tox_menus.cpp | 6 +----- protocols/Tox/src/tox_proto.cpp | 3 --- protocols/Tox/src/tox_proto.h | 2 +- src/mir_app/src/menu_clist.cpp | 2 +- src/mir_app/src/mir_app.def | 1 + src/mir_app/src/mir_app64.def | 1 + src/mir_app/src/proto_accs.cpp | 2 +- src/mir_app/src/proto_utils.cpp | 3 +++ 32 files changed, 32 insertions(+), 137 deletions(-) diff --git a/include/m_protoint.h b/include/m_protoint.h index da863f4251..251308aea9 100644 --- a/include/m_protoint.h +++ b/include/m_protoint.h @@ -37,7 +37,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. typedef enum { EV_PROTO_ONERASE, - EV_PROTO_ONMENU } PROTOEVENTTYPE; @@ -224,6 +223,7 @@ public: ////////////////////////////////////////////////////////////////////////////////////// // events + virtual void OnBuildProtoMenu(void); virtual void OnContactDeleted(MCONTACT); virtual void OnModulesLoaded(void); // the analog of ME_SYSTEM_MODULESLOADED for an account virtual void OnShutdown(void); // same for ME_SYSTEM_SHUTDOWN diff --git a/libs/win32/mir_app.lib b/libs/win32/mir_app.lib index ec09ec2d6f..1c468fe4fc 100644 Binary files a/libs/win32/mir_app.lib and b/libs/win32/mir_app.lib differ diff --git a/libs/win64/mir_app.lib b/libs/win64/mir_app.lib index e5ff43924a..dc466f9c0f 100644 Binary files a/libs/win64/mir_app.lib and b/libs/win64/mir_app.lib differ diff --git a/protocols/FacebookRM/src/proto.cpp b/protocols/FacebookRM/src/proto.cpp index e280fbc737..d494385cf4 100644 --- a/protocols/FacebookRM/src/proto.cpp +++ b/protocols/FacebookRM/src/proto.cpp @@ -385,19 +385,6 @@ INT_PTR FacebookProto::GetNotificationsCount(WPARAM, LPARAM) return facy.notifications.size(); } -////////////////////////////////////////////////////////////////////////////// - -int FacebookProto::OnEvent(PROTOEVENTTYPE event, WPARAM wParam, LPARAM lParam) -{ - switch (event) { - case EV_PROTO_ONMENU: - InitMenu(); - break; - } - - return 1; -} - ////////////////////////////////////////////////////////////////////////////// // EVENTS diff --git a/protocols/FacebookRM/src/proto.h b/protocols/FacebookRM/src/proto.h index f4a35b48c0..6cef8a3e8a 100644 --- a/protocols/FacebookRM/src/proto.h +++ b/protocols/FacebookRM/src/proto.h @@ -126,8 +126,7 @@ public: int UserIsTyping(MCONTACT hContact, int type) override; - int OnEvent(PROTOEVENTTYPE iEventType, WPARAM wParam, LPARAM lParam) override; - + void OnBuildProtoMenu(void) override; void OnContactDeleted(MCONTACT) override; void OnModulesLoaded() override; void OnShutdown() override; @@ -166,7 +165,6 @@ public: void InitPopups(); void InitHotkeys(); void InitSounds(); - void InitMenu(); // Events int __cdecl OnOptionsInit(WPARAM, LPARAM); diff --git a/protocols/FacebookRM/src/theme.cpp b/protocols/FacebookRM/src/theme.cpp index 71fb869c95..1e857200d9 100644 --- a/protocols/FacebookRM/src/theme.cpp +++ b/protocols/FacebookRM/src/theme.cpp @@ -191,7 +191,7 @@ int FacebookProto::OnPrebuildContactMenu(WPARAM wParam, LPARAM) return 0; } -void FacebookProto::InitMenu() +void FacebookProto::OnBuildProtoMenu() { CMenuItem mi; mi.position = 201001; diff --git a/protocols/Gadu-Gadu/src/gg.cpp b/protocols/Gadu-Gadu/src/gg.cpp index 8bd715294d..37491551bc 100644 --- a/protocols/Gadu-Gadu/src/gg.cpp +++ b/protocols/Gadu-Gadu/src/gg.cpp @@ -273,7 +273,7 @@ void GaduProto::block_uninit() ////////////////////////////////////////////////////////// // Menus initialization // -void GaduProto::menus_init() +void GaduProto::OnBuildProtoMenu() { HGENMENU hRoot = Menu_GetProtocolRoot(this); diff --git a/protocols/Gadu-Gadu/src/gg_proto.cpp b/protocols/Gadu-Gadu/src/gg_proto.cpp index c78ca2ea95..513e99df61 100644 --- a/protocols/Gadu-Gadu/src/gg_proto.cpp +++ b/protocols/Gadu-Gadu/src/gg_proto.cpp @@ -730,14 +730,3 @@ void GaduProto::OnShutdown() img_shutdown(); sessions_closedlg(); } - -int GaduProto::OnEvent(PROTOEVENTTYPE eventType, WPARAM wParam, LPARAM lParam) -{ - switch (eventType) { - case EV_PROTO_ONMENU: - menus_init(); - break; - } - - return TRUE; -} diff --git a/protocols/Gadu-Gadu/src/gg_proto.h b/protocols/Gadu-Gadu/src/gg_proto.h index 3d2dd02d07..8d9dc100aa 100644 --- a/protocols/Gadu-Gadu/src/gg_proto.h +++ b/protocols/Gadu-Gadu/src/gg_proto.h @@ -56,7 +56,7 @@ struct GaduProto : public PROTO 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; @@ -121,7 +121,6 @@ struct GaduProto : public PROTO int gettoken(GGTOKEN *token); void parsecontacts(char *contacts); void remindpassword(uin_t uin, const char *email); - void menus_init(); /* Avatar functions */ void getAvatarFilename(MCONTACT hContact, wchar_t *pszDest, int cbLen); diff --git a/protocols/IRCG/src/ircproto.cpp b/protocols/IRCG/src/ircproto.cpp index 309e65374d..f4c42f4e80 100644 --- a/protocols/IRCG/src/ircproto.cpp +++ b/protocols/IRCG/src/ircproto.cpp @@ -808,16 +808,3 @@ int CIrcProto::SetAwayMsg(int status, const wchar_t* msg) return 0; } - -///////////////////////////////////////////////////////////////////////////////////////// -// OnEvent - maintain protocol events - -int CIrcProto::OnEvent(PROTOEVENTTYPE eventType, WPARAM wParam, LPARAM lParam) -{ - switch (eventType) { - case EV_PROTO_ONMENU: - InitMainMenus(); - break; - } - return 1; -} diff --git a/protocols/IRCG/src/ircproto.h b/protocols/IRCG/src/ircproto.h index 9797574c0a..8947ca68a2 100644 --- a/protocols/IRCG/src/ircproto.h +++ b/protocols/IRCG/src/ircproto.h @@ -69,8 +69,7 @@ struct CIrcProto : public PROTO HANDLE GetAwayMsg(MCONTACT hContact) override; int SetAwayMsg(int m_iStatus, const wchar_t *msg) override; - int OnEvent(PROTOEVENTTYPE eventType, WPARAM wParam, LPARAM lParam) override; - + void OnBuildProtoMenu(void) override; void OnContactDeleted(MCONTACT) override; void OnModulesLoaded() override; void OnShutdown() override; @@ -275,7 +274,6 @@ struct CIrcProto : public PROTO // services.cpp void ConnectToServer(void); void DisconnectFromServer(void); - void InitMainMenus(void); void __cdecl ConnectServerThread(void*); void __cdecl DisconnectServerThread(void*); diff --git a/protocols/IRCG/src/services.cpp b/protocols/IRCG/src/services.cpp index 8b4413ce9d..9881e13ab1 100644 --- a/protocols/IRCG/src/services.cpp +++ b/protocols/IRCG/src/services.cpp @@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "stdafx.h" -void CIrcProto::InitMainMenus(void) +void CIrcProto::OnBuildProtoMenu() { CMenuItem mi; mi.root = Menu_GetProtocolRoot(this); 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, 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, public IJabberInterface void GlobalMenuInit(void); void GlobalMenuUninit(void); - void MenuInit(void); void MenuUpdateSrmmIcon(JABBER_LIST_ITEM *item); void BuildPriorityMenu(void); diff --git a/protocols/MRA/src/MraIcons.cpp b/protocols/MRA/src/MraIcons.cpp index 2be25ea965..4a82300695 100644 --- a/protocols/MRA/src/MraIcons.cpp +++ b/protocols/MRA/src/MraIcons.cpp @@ -49,6 +49,13 @@ IconItem gdiExtraStatusIconsItems[ADV_ICON_MAX] = ////////////////////////////////////////////////////////////////////////////////////// +void CMraProto::OnBuildProtoMenu() +{ + CListCreateMenu(2000060000, 500085000, TRUE, gdiMenuItems, MAIN_MENU_ITEMS_COUNT, hMainMenuItems); +} + +////////////////////////////////////////////////////////////////////////////////////// + HICON IconLibGetIcon(HANDLE hIcon) { return IconLibGetIconEx(hIcon, LR_SHARED); diff --git a/protocols/MRA/src/MraProto.cpp b/protocols/MRA/src/MraProto.cpp index 73698f42e0..8dada4acde 100644 --- a/protocols/MRA/src/MraProto.cpp +++ b/protocols/MRA/src/MraProto.cpp @@ -551,13 +551,3 @@ int CMraProto::UserIsTyping(MCONTACT hContact, int type) return 1; } - -int CMraProto::OnEvent(PROTOEVENTTYPE eventType, WPARAM, LPARAM) -{ - switch (eventType) { - case EV_PROTO_ONMENU: - CListCreateMenu(2000060000, 500085000, TRUE, gdiMenuItems, MAIN_MENU_ITEMS_COUNT, hMainMenuItems); - break; - } - return 1; -} diff --git a/protocols/MRA/src/MraProto.h b/protocols/MRA/src/MraProto.h index fa16b5fbcf..80cbec1f33 100644 --- a/protocols/MRA/src/MraProto.h +++ b/protocols/MRA/src/MraProto.h @@ -71,7 +71,7 @@ struct CMraProto : public PROTO int UserIsTyping(MCONTACT hContact, int type) override; - int OnEvent(PROTOEVENTTYPE eventType, WPARAM wParam, LPARAM lParam) override; + void OnBuildProtoMenu(void) override; void OnModulesLoaded() override; void OnShutdown() override; 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 int OnEvent(PROTOEVENTTYPE eventType, WPARAM wParam, LPARAM lParam) override; + void OnBuildProtoMenu(void) override; void OnContactDeleted(MCONTACT) override; void OnModulesLoaded() override; void OnShutdown() override; @@ -221,20 +222,11 @@ struct CMsnProto : public PROTO 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 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 @@ -278,19 +264,6 @@ struct CMsnProto : public PROTO 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 @@ -311,7 +284,7 @@ struct CMsnProto : public PROTO 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); 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); diff --git a/protocols/Tox/src/tox_menus.cpp b/protocols/Tox/src/tox_menus.cpp index 9dc0ee8b79..e876cbeb6f 100644 --- a/protocols/Tox/src/tox_menus.cpp +++ b/protocols/Tox/src/tox_menus.cpp @@ -44,10 +44,8 @@ int CToxProto::UpdateStatusMenu(WPARAM, LPARAM) return 0; } -int CToxProto::OnInitStatusMenu() +void CToxProto::OnBuildProtoMenu() { - //HookProtoEvent(ME_CLIST_PREBUILDSTATUSMENU, &CToxProto::UpdateStatusMenu); - CMenuItem mi; mi.flags = CMIF_UNICODE; mi.root = Menu_GetProtocolRoot(this); @@ -87,6 +85,4 @@ int CToxProto::OnInitStatusMenu() StatusMenuItems[SMI_PASSWORD_REMOVE] = Menu_AddProtoMenuItem(&mi, m_szModuleName); UpdateStatusMenu(NULL, NULL); - - return 0; } diff --git a/protocols/Tox/src/tox_proto.cpp b/protocols/Tox/src/tox_proto.cpp index f893e881fe..c8c66012a1 100644 --- a/protocols/Tox/src/tox_proto.cpp +++ b/protocols/Tox/src/tox_proto.cpp @@ -228,9 +228,6 @@ int CToxProto::UserIsTyping(MCONTACT hContact, int type) int CToxProto::OnEvent(PROTOEVENTTYPE iEventType, WPARAM, LPARAM) { switch (iEventType) { - case EV_PROTO_ONMENU: - return OnInitStatusMenu(); - case EV_PROTO_ONERASE: return OnDeleteToxProfile(); } diff --git a/protocols/Tox/src/tox_proto.h b/protocols/Tox/src/tox_proto.h index b89ce4118d..e29fceaa14 100644 --- a/protocols/Tox/src/tox_proto.h +++ b/protocols/Tox/src/tox_proto.h @@ -47,6 +47,7 @@ public: int UserIsTyping(MCONTACT hContact, int type) override; int OnEvent(PROTOEVENTTYPE iEventType, WPARAM wParam, LPARAM lParam) override; + void OnBuildProtoMenu(void) override; void OnContactDeleted(MCONTACT) override; void OnModulesLoaded() override; @@ -134,7 +135,6 @@ private: int __cdecl OnPrebuildContactMenu(WPARAM hContact, LPARAM); HGENMENU StatusMenuItems[SMI_MAX]; - int OnInitStatusMenu(); int __cdecl UpdateStatusMenu(WPARAM, LPARAM); //services diff --git a/src/mir_app/src/menu_clist.cpp b/src/mir_app/src/menu_clist.cpp index 983b3ccbc8..d8eba369c9 100644 --- a/src/mir_app/src/menu_clist.cpp +++ b/src/mir_app/src/menu_clist.cpp @@ -867,7 +867,7 @@ void BuildProtoMenus() continue; if (pa->ppro) - pa->ppro->OnEvent(EV_PROTO_ONMENU, 0, 0); + pa->ppro->OnBuildProtoMenu(); } } diff --git a/src/mir_app/src/mir_app.def b/src/mir_app/src/mir_app.def index ff52786b35..6dd0b637d3 100644 --- a/src/mir_app/src/mir_app.def +++ b/src/mir_app/src/mir_app.def @@ -585,3 +585,4 @@ Proto_GetStatus @601 ?OnShutdown@PROTO_INTERFACE@@UAEXXZ @608 NONAME Contact_GetStatus @609 ?OnContactDeleted@PROTO_INTERFACE@@UAEXI@Z @610 NONAME +?OnBuildProtoMenu@PROTO_INTERFACE@@UAEXXZ @611 NONAME diff --git a/src/mir_app/src/mir_app64.def b/src/mir_app/src/mir_app64.def index a802c989ba..d702a1bae5 100644 --- a/src/mir_app/src/mir_app64.def +++ b/src/mir_app/src/mir_app64.def @@ -585,3 +585,4 @@ Proto_GetStatus @601 ?OnShutdown@PROTO_INTERFACE@@UEAAXXZ @608 NONAME Contact_GetStatus @609 ?OnContactDeleted@PROTO_INTERFACE@@UEAAXI@Z @610 NONAME +?OnBuildProtoMenu@PROTO_INTERFACE@@UEAAXXZ @611 NONAME diff --git a/src/mir_app/src/proto_accs.cpp b/src/mir_app/src/proto_accs.cpp index 8d54ace0de..2dd3787ded 100644 --- a/src/mir_app/src/proto_accs.cpp +++ b/src/mir_app/src/proto_accs.cpp @@ -297,7 +297,7 @@ bool ActivateAccount(PROTOACCOUNT *pa, bool bIsDynamic) if (bModulesLoadedFired) pa->ppro->OnModulesLoaded(); if (!db_get_b(0, "CList", "MoveProtoMenus", true)) - pa->ppro->OnEvent(EV_PROTO_ONMENU, 0, 0); + pa->ppro->OnBuildProtoMenu(); pa->bDynDisabled = false; } return true; diff --git a/src/mir_app/src/proto_utils.cpp b/src/mir_app/src/proto_utils.cpp index 759416c5e1..f7fd336010 100644 --- a/src/mir_app/src/proto_utils.cpp +++ b/src/mir_app/src/proto_utils.cpp @@ -176,6 +176,9 @@ PROTO_INTERFACE::~PROTO_INTERFACE() WindowList_Destroy(m_hWindowList); } +void PROTO_INTERFACE::OnBuildProtoMenu() +{} + void PROTO_INTERFACE::OnContactDeleted(MCONTACT) {} -- cgit v1.2.3