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/IRCG/src/services.cpp | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'protocols/IRCG')

diff --git a/protocols/IRCG/src/services.cpp b/protocols/IRCG/src/services.cpp
index ef3635738c..5dab9c9973 100644
--- a/protocols/IRCG/src/services.cpp
+++ b/protocols/IRCG/src/services.cpp
@@ -32,7 +32,7 @@ void CIrcProto::InitMainMenus(void)
 	HGENMENU hRoot = Menu_GetProtocolRoot(m_szModuleName);
 	if (hRoot == NULL) {
 		// Root popupmenuitem
-		mi.ptszName = m_tszUserName;
+		mi.name.t = m_tszUserName;
 		mi.position = -1999901010;
 		mi.flags = CMIF_TCHAR | CMIF_KEEPUNTRANSLATED;
 		mi.icolibItem = GetIconHandle(IDI_MAIN);
@@ -46,7 +46,7 @@ void CIrcProto::InitMainMenus(void)
 	}
 
 	mi.flags = 0;
-	mi.pszName = LPGEN("&Quick connect");
+	mi.name.a = LPGEN("&Quick connect");
 	mi.icolibItem = GetIconHandle(IDI_QUICK);
 	mir_strcpy(d, IRC_QUICKCONNECT);
 	mi.position = 201001;
@@ -55,26 +55,26 @@ void CIrcProto::InitMainMenus(void)
 
 	if (m_iStatus != ID_STATUS_OFFLINE) mi.flags |= CMIF_GRAYED;
 
-	mi.pszName = LPGEN("&Join channel");
+	mi.name.a = LPGEN("&Join channel");
 	mi.icolibItem = Skin_GetIconHandle(SKINICON_CHAT_JOIN);//GetIconHandle(IDI_JOIN);
 	mir_strcpy(d, IRC_JOINCHANNEL);
 	mi.position = 201002;
 	hMenuJoin = Menu_AddProtoMenuItem(&mi);
 
-	mi.pszName = LPGEN("&Change your nickname");
+	mi.name.a = LPGEN("&Change your nickname");
 	mi.icolibItem = GetIconHandle(IDI_RENAME);
 	mir_strcpy(d, IRC_CHANGENICK);
 	mi.position = 201003;
 	hMenuNick = Menu_AddProtoMenuItem(&mi);
 
-	mi.pszName = LPGEN("Show the &list of available channels");
+	mi.name.a = LPGEN("Show the &list of available channels");
 	mi.icolibItem = GetIconHandle(IDI_LIST);
 	mir_strcpy(d, IRC_SHOWLIST);
 	mi.position = 201004;
 	hMenuList = Menu_AddProtoMenuItem(&mi);
 
 	if (m_useServer) mi.flags &= ~CMIF_GRAYED;
-	mi.pszName = LPGEN("&Show the server window");
+	mi.name.a = LPGEN("&Show the server window");
 	mi.icolibItem = GetIconHandle(IDI_SERVER);
 	mir_strcpy(d, IRC_SHOWSERVER);
 	mi.position = 201005;
@@ -142,28 +142,28 @@ void InitContactMenus(void)
 	CLISTMENUITEM mi = { 0 };
 	mi.pszService = temp;
 
-	mi.pszName = LPGEN("Channel &settings");
+	mi.name.a = LPGEN("Channel &settings");
 	mi.icolibItem = GetIconHandle(IDI_MANAGER);
 	mir_strcpy(d, IRC_UM_CHANSETTINGS);
 	mi.position = 500090002;
 	hUMenuChanSettings = Menu_AddContactMenuItem(&mi);
 	hMenuChanSettings = CreateServiceFunction(temp, IrcMenuChanSettings);
 
-	mi.pszName = LPGEN("&WhoIs info");
+	mi.name.a = LPGEN("&WhoIs info");
 	mi.icolibItem = GetIconHandle(IDI_WHOIS);
 	mir_strcpy(d, IRC_UM_WHOIS);
 	mi.position = 500090001;
 	hUMenuWhois = Menu_AddContactMenuItem(&mi);
 	hMenuWhois = CreateServiceFunction(temp, IrcMenuWhois);
 
-	mi.pszName = LPGEN("Di&sconnect");
+	mi.name.a = LPGEN("Di&sconnect");
 	mi.icolibItem = GetIconHandle(IDI_DELETE);
 	mir_strcpy(d, IRC_UM_DISCONNECT);
 	mi.position = 500090001;
 	hUMenuDisconnect = Menu_AddContactMenuItem(&mi);
 	hMenuDisconnect = CreateServiceFunction(temp, IrcMenuDisconnect);
 
-	mi.pszName = LPGEN("&Add to ignore list");
+	mi.name.a = LPGEN("&Add to ignore list");
 	mi.icolibItem = GetIconHandle(IDI_BLOCK);
 	mir_strcpy(d, IRC_UM_IGNORE);
 	mi.position = 500090002;
-- 
cgit v1.2.3