From 3aa33bc976db4a08fd5260ed55cf8613293992ef Mon Sep 17 00:00:00 2001
From: ElzorFox <elzorfox@ya.ru>
Date: Mon, 4 Dec 2023 16:31:47 +0500
Subject: VKontakte: remove NewStory menu items

---
 protocols/VKontakte/src/vk_proto.cpp | 9 ++++++---
 protocols/VKontakte/src/vk_proto.h   | 5 +++--
 2 files changed, 9 insertions(+), 5 deletions(-)

(limited to 'protocols')

diff --git a/protocols/VKontakte/src/vk_proto.cpp b/protocols/VKontakte/src/vk_proto.cpp
index a56e7697d1..78086e3303 100644
--- a/protocols/VKontakte/src/vk_proto.cpp
+++ b/protocols/VKontakte/src/vk_proto.cpp
@@ -221,7 +221,7 @@ void CVkProto::InitMenus()
 		
 		mi.position = 10000000 + NSMI_REPLY;
 		mi.name.a = LPGEN("Reply");
-		m_hNewStoryReply = Menu_AddNewStoryMenuItem(&mi, NSMI_REPLY);
+		m_hNewStoryMenuItems[NSMI_REPLY] = Menu_AddNewStoryMenuItem(&mi, NSMI_REPLY);
 	};
 
 	//Contact Menu Services
@@ -418,10 +418,10 @@ int CVkProto::OnPreBuildContactMenu(WPARAM hContact, LPARAM)
 int CVkProto::OnPrebuildNSMenu(WPARAM hContact, LPARAM lParam)
 {
 	if (!Proto_IsProtoOnContact(hContact, m_szModuleName))
-		Menu_ShowItem(m_hNewStoryReply, false);
+		Menu_ShowItem(m_hNewStoryMenuItems[NSMI_REPLY], false);
 	else {
 		auto* pDbei = (DB::EventInfo *)lParam;
-		Menu_ShowItem(m_hNewStoryReply, mir_strlen(pDbei->szId) > 0 && !Contact::IsReadonly(hContact));
+		Menu_ShowItem(m_hNewStoryMenuItems[NSMI_REPLY], mir_strlen(pDbei->szId) > 0 && !Contact::IsReadonly(hContact));
 	}
 	return 0;
 }
@@ -452,6 +452,9 @@ void CVkProto::UnInitMenus()
 
 	for (int i = 0; i < CMI_COUNT; i++)
 		Menu_RemoveItem(m_hContactMenuItems[i]);
+
+	for (int i = 0; i < NSMI_COUNT; i++)
+		Menu_RemoveItem(m_hNewStoryMenuItems[i]);
 }
 
 /////////////////////////////////////////////////////////////////////////////////////////
diff --git a/protocols/VKontakte/src/vk_proto.h b/protocols/VKontakte/src/vk_proto.h
index a86bb39e28..bc54a46dc3 100644
--- a/protocols/VKontakte/src/vk_proto.h
+++ b/protocols/VKontakte/src/vk_proto.h
@@ -191,7 +191,8 @@ private:
 	};
 
 	enum NewStoryMenuIndexes {
-		NSMI_REPLY = 1
+		NSMI_REPLY,
+		NSMI_COUNT
 	};
 
 	//====================================================================================
@@ -252,7 +253,7 @@ private:
 		m_hContactMenuItems[CMI_COUNT],
 		m_hContactHistoryMenuItems[CHMI_COUNT],
 		m_hProtoMenuItems[PMI_COUNT],
-		m_hNewStoryReply;
+		m_hNewStoryMenuItems[NSMI_COUNT];
 
 
 	void InitSmileys();
-- 
cgit v1.2.3