- 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

1 files changed, 10 insertions, 10 deletions

diff --git a/protocols/MSN/src/msn_menu.cpp b/protocols/MSN/src/msn_menu.cpp
index 2a43ea284b..a70494628c 100644
--- a/protocols/MSN/src/msn_menu.cpp
+++ b/protocols/MSN/src/msn_menu.cpp
@@ -279,7 +279,7 @@ void CMsnProto::MsnInitMainMenu(void)
 		mi.position = 500085000;

 		mi.flags = CMIF_TCHAR | CMIF_KEEPUNTRANSLATED;

 		mi.icolibItem = GetIconHandle(IDI_MSN);

-		mi.ptszName = m_tszUserName;

+		mi.name.t = m_tszUserName;

 		hRoot = mainMenuRoot = Menu_AddProtoMenuItem(&mi);

 	}

 	else {

@@ -296,7 +296,7 @@ void CMsnProto::MsnInitMainMenu(void)
 	CreateProtoService(MS_SET_NICKNAME_UI, &CMsnProto::SetNicknameUI);

 	mi.position = 201001;

 	mi.icolibItem = GetIconHandle(IDI_MSN);

-	mi.pszName = LPGEN("Set &Nickname");

+	mi.name.a = LPGEN("Set &Nickname");

 	menuItemsMain[0] = Menu_AddProtoMenuItem(&mi);

 #endif

 

@@ -304,28 +304,28 @@ void CMsnProto::MsnInitMainMenu(void)
 	CreateProtoService(MSN_INVITE, &CMsnProto::MsnInviteCommand);

 	mi.position = 201002;

 	mi.icolibItem = GetIconHandle(IDI_INVITE);

-	mi.pszName = LPGEN("Create &Chat");

+	mi.name.a = LPGEN("Create &Chat");

 	menuItemsMain[0] = Menu_AddProtoMenuItem(&mi);

 

 	mir_strcpy(tDest, MS_GOTO_INBOX);

 	CreateProtoService(MS_GOTO_INBOX, &CMsnProto::MsnGotoInbox);

 	mi.position = 201003;

 	mi.icolibItem = GetIconHandle(IDI_INBOX);

-	mi.pszName = LPGEN("Display &Hotmail Inbox");

+	mi.name.a = LPGEN("Display &Hotmail Inbox");

 	menuItemsMain[1] = Menu_AddProtoMenuItem(&mi);

 

 	mir_strcpy(tDest, MS_EDIT_PROFILE);

 	CreateProtoService(MS_EDIT_PROFILE, &CMsnProto::MsnEditProfile);

 	mi.position = 201004;

 	mi.icolibItem = GetIconHandle(IDI_PROFILE);

-	mi.pszName = LPGEN("View &Profile");

+	mi.name.a = LPGEN("View &Profile");

 	menuItemsMain[2] = Menu_AddProtoMenuItem(&mi);

 

 	mir_strcpy(tDest, MS_EDIT_ALERTS);

 	CreateProtoService(MS_EDIT_ALERTS, &CMsnProto::MsnSetupAlerts);

 	mi.position = 201004;

 	mi.icolibItem = GetIconHandle(IDI_PROFILE);

-	mi.pszName = LPGEN("Setup Live &Alerts");

+	mi.name.a = LPGEN("Setup Live &Alerts");

 	menuItemsMain[3] = Menu_AddProtoMenuItem(&mi);

 

 	MSN_EnableMenuItems(m_iStatus >= ID_STATUS_ONLINE);

@@ -410,14 +410,14 @@ void MSN_InitContactMenu(void)
 	hBlockCom = CreateServiceFunction(servicefunction, MsnMenuBlockCommand);

 	mi.position = -500050000;

 	mi.icolibItem = GetIconHandle(IDI_MSNBLOCK);

-	mi.pszName = LPGEN("&Block");

+	mi.name.a = LPGEN("&Block");

 	hBlockMenuItem = Menu_AddContactMenuItem(&mi);

 

 	mir_strcpy(tDest, MSN_VIEW_PROFILE);

 	hViewProfile = CreateServiceFunction(servicefunction, MsnMenuViewProfile);

 	mi.position = -500050003;

 	mi.icolibItem = GetIconHandle(IDI_PROFILE);

-	mi.pszName = LPGEN("View &Profile");

+	mi.name.a = LPGEN("View &Profile");

 	hLiveSpaceMenuItem = Menu_AddContactMenuItem(&mi);

 

 #ifdef OBSOLETE

@@ -426,7 +426,7 @@ void MSN_InitContactMenu(void)
 	mi.flags = CMIF_NOTOFFLINE;

 	mi.position = -500050002;

 	mi.icolibItem = GetIconHandle(IDI_NETMEETING);

-	mi.pszName = LPGEN("&Start Netmeeting");

+	mi.name.a = LPGEN("&Start Netmeeting");

 	hNetmeetingMenuItem = Menu_AddContactMenuItem(&mi);

 #endif

 

@@ -435,7 +435,7 @@ void MSN_InitContactMenu(void)
 	mi.position = -2000010005;

 	mi.flags = CMIF_HIDDEN;

 	mi.icolibItem = Skin_GetIconHandle(SKINICON_OTHER_SENDEMAIL);

-	mi.pszName = LPGEN("Open &Hotmail Inbox");

+	mi.name.a = LPGEN("Open &Hotmail Inbox");

 	hOpenInboxMenuItem = Menu_AddContactMenuItem(&mi);

 

 	HookEvent(ME_CLIST_PREBUILDCONTACTMENU, MSN_OnPrebuildContactMenu);