From d15bd517fb0eb4bbdb1b118b44398b00bc8f6d6a Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Fri, 9 Feb 2018 16:13:50 +0300
Subject: all duplicate "Request auth", "Grant auth" & "Revoke auth" menu items
 eliminated

---
 include/m_icq.h      | 12 ------------
 include/m_protoint.h |  5 ++++-
 include/m_protosvc.h | 21 +++++++++++++++++++++
 3 files changed, 25 insertions(+), 13 deletions(-)

(limited to 'include')

diff --git a/include/m_icq.h b/include/m_icq.h
index b268f2466e..01d5e08b65 100644
--- a/include/m_icq.h
+++ b/include/m_icq.h
@@ -46,18 +46,6 @@ typedef struct {
 } ICQSEARCHRESULT;
 
 
-// Request authorization
-// wParam = (WPARAM)hContact
-#define MS_REQ_AUTH "/ReqAuth"
-
-// Grant authorization
-// wParam = (WPARAM)hContact;
-#define MS_GRANT_AUTH "/GrantAuth"
-
-// Revoke authorization
-// wParam = (WPARAM)hContact
-#define MS_REVOKE_AUTH "/RevokeAuth"
-
 // Open ICQ profile
 // wParam = (WPARAM)hContact
 #define MS_OPEN_PROFILE "/OpenProfile"
diff --git a/include/m_protoint.h b/include/m_protoint.h
index d105f55862..5a7e115a74 100644
--- a/include/m_protoint.h
+++ b/include/m_protoint.h
@@ -95,7 +95,10 @@ public:
 	char*       m_szModuleName;    // internal protocol name, also its database module name
 	HANDLE      m_hProtoIcon;      // icon to be displayed in the account manager
 	HNETLIBUSER m_hNetlibUser;     // network agent
-	HGENMENU    m_hMainMenuItem;	 // if protocol menus are displayed in the main menu, this is the root
+	HGENMENU    m_hmiMainMenu;     // if protocol menus are displayed in the main menu, this is the root
+	HGENMENU    m_hmiReqAuth;      // a menu item for /RequestAuth service
+	HGENMENU    m_hmiGrantAuth;    // a menu item for /GrantAuth service
+	HGENMENU    m_hmiRevokeAuth;   // a menu item for /RevokeAuth service
 
 	PROTO_INTERFACE(const char *pszModuleName, const wchar_t *ptszUserName);
 	~PROTO_INTERFACE();
diff --git a/include/m_protosvc.h b/include/m_protosvc.h
index e376c3d4ab..723b7260ae 100644
--- a/include/m_protosvc.h
+++ b/include/m_protosvc.h
@@ -574,6 +574,27 @@ struct PROTOFILERESUME
 
 #define PS_GETUNREADEMAILCOUNT "/GetUnreadEmailCount"
 
+///////////////////////////////////////////////////////////////////////////////
+// Gets called when a user clicks the "Request auth" menu item
+// wParam = hContact
+// lParam = 0
+
+#define PS_MENU_REQAUTH "/ReqAuth"
+
+///////////////////////////////////////////////////////////////////////////////
+// Gets called when a user clicks the "Grant auth" menu item
+// wParam = hContact
+// lParam = 0
+
+#define PS_MENU_GRANTAUTH "/GrantAuth"
+
+///////////////////////////////////////////////////////////////////////////////
+// Gets called when a user clicks the "Revoke auth" menu item
+// wParam = hContact
+// lParam = 0
+
+#define PS_MENU_REVOKEAUTH "/RevokeAuth"
+
 ///////////////////////////////////////////////////////////////////////////////
 //                            SENDING SERVICES
 // these should be called with CallContactService()
-- 
cgit v1.2.3