From ab4abbb7a60f941acab8f0566c6b619f68f1b489 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Sat, 27 Jun 2015 11:09:19 +0000
Subject: - CLISTMENUITEM::pszContactOwner removed, because it's supported only
 by contact's menu; - Menu_AddContactMenuItem now receives parameter szProto;
 - Menu_Add* helpers are converted into real functions;

git-svn-id: http://svn.miranda-ng.org/main/trunk@14409 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 protocols/SkypeWeb/src/skype_menus.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'protocols/SkypeWeb')

diff --git a/protocols/SkypeWeb/src/skype_menus.cpp b/protocols/SkypeWeb/src/skype_menus.cpp
index 0d072a76b3..d3b5f9b130 100644
--- a/protocols/SkypeWeb/src/skype_menus.cpp
+++ b/protocols/SkypeWeb/src/skype_menus.cpp
@@ -65,7 +65,7 @@ void CSkypeProto::InitMenus()
 
 	// Request authorization
 	mi.pszService = MODULE"/RequestAuth";
-	mi.ptszName = LPGENT("Request authorization");
+	mi.name.t = LPGENT("Request authorization");
 	mi.position = CMI_POSITION + CMI_AUTH_REQUEST;
 	mi.icolibItem = ::Skin_GetIconHandle(SKINICON_AUTH_REQUEST);
 	ContactMenuItems[CMI_AUTH_REQUEST] = Menu_AddContactMenuItem(&mi);
@@ -73,28 +73,28 @@ void CSkypeProto::InitMenus()
 
 	// Grant authorization
 	mi.pszService = MODULE"/GrantAuth";
-	mi.ptszName = LPGENT("Grant authorization");
+	mi.name.t = LPGENT("Grant authorization");
 	mi.position = CMI_POSITION + CMI_AUTH_GRANT;
 	mi.icolibItem = ::Skin_GetIconHandle(SKINICON_AUTH_GRANT);
 	ContactMenuItems[CMI_AUTH_GRANT] = Menu_AddContactMenuItem(&mi);
 	CreateServiceFunction(mi.pszService, GlobalService<&CSkypeProto::OnGrantAuth>);
 
 	mi.pszService = MODULE"/GetHistory";
-	mi.ptszName = LPGENT("Get server history");
+	mi.name.t = LPGENT("Get server history");
 	mi.position = CMI_POSITION + CMI_GETSERVERHISTORY;
 	mi.icolibItem = GetIconHandle("synchistory");
 	ContactMenuItems[CMI_GETSERVERHISTORY] = Menu_AddContactMenuItem(&mi);
 	CreateServiceFunction(mi.pszService, GlobalService<&CSkypeProto::GetContactHistory>);
 
 	mi.pszService = MODULE"/BlockContact";
-	mi.ptszName = LPGENT("Block contact");
+	mi.name.t = LPGENT("Block contact");
 	mi.position = CMI_POSITION + CMI_BLOCK;
 	mi.icolibItem = GetIconHandle("user_block");
 	ContactMenuItems[CMI_BLOCK] = Menu_AddContactMenuItem(&mi);
 	CreateServiceFunction(mi.pszService, GlobalService<&CSkypeProto::BlockContact>);
 
 	mi.pszService = MODULE"/UnblockContact";
-	mi.ptszName = LPGENT("Unblock contact");
+	mi.name.t = LPGENT("Unblock contact");
 	mi.position = CMI_POSITION + CMI_UNBLOCK;
 	mi.icolibItem = GetIconHandle("user_unblock");
 	ContactMenuItems[CMI_UNBLOCK] = Menu_AddContactMenuItem(&mi);
@@ -118,7 +118,7 @@ int CSkypeProto::OnInitStatusMenu()
 	HGENMENU hStatusMunuRoot = Menu_GetProtocolRoot(m_szModuleName);
 	if (!hStatusMunuRoot)
 	{
-		mi.ptszName = m_tszUserName;
+		mi.name.t = m_tszUserName;
 		mi.position = -1999901006;
 		mi.flags = CMIF_TCHAR | CMIF_KEEPUNTRANSLATED;
 		mi.icolibItem = Skin_GetIconHandle("main");
@@ -137,7 +137,7 @@ int CSkypeProto::OnInitStatusMenu()
 
 	mir_strcpy(tDest, "/CreateNewChat");
 	CreateProtoService(tDest, &CSkypeProto::SvcCreateChat);
-	mi.ptszName = LPGENT("Create new chat");
+	mi.name.t = LPGENT("Create new chat");
 	mi.position = SMI_POSITION + SMI_CREATECHAT;
 	mi.icolibItem = GetIconHandle("conference");
 	Menu_AddProtoMenuItem(&mi);
-- 
cgit v1.2.3