From 9300399ed59f4d82f5e62f5ef43b752da4dd0735 Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Sun, 22 Apr 2018 14:34:57 +0300
Subject: EV_PROTO_ONMENU removed

---
 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 +++
 5 files changed, 7 insertions(+), 2 deletions(-)

(limited to 'src')

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