- 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, 4 insertions, 4 deletions

diff --git a/plugins/BasicHistory/src/BasicHistory.cpp b/plugins/BasicHistory/src/BasicHistory.cpp
index f95b352062..c1dce1dfdd 100644
--- a/plugins/BasicHistory/src/BasicHistory.cpp
+++ b/plugins/BasicHistory/src/BasicHistory.cpp
@@ -99,7 +99,7 @@ void InitMenuItems()
 	CLISTMENUITEM mi = { 0 };

 	mi.position = 1000090000;

 	mi.icolibItem = Skin_GetIconHandle(SKINICON_OTHER_HISTORY);

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

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

 	mi.pszService = MS_HISTORY_SHOWCONTACTHISTORY;

 	hContactMenu = Menu_AddContactMenuItem(&mi);

 

@@ -109,7 +109,7 @@ void InitMenuItems()
 

 	mi.position = 1000090001;

 	mi.icolibItem = Skin_GetIconHandle(SKINICON_OTHER_DELETE);

-	mi.pszName = LPGEN("Delete All User History");

+	mi.name.a = LPGEN("Delete All User History");

 	mi.pszService = MS_HISTORY_DELETEALLCONTACTHISTORY;

 	hDeleteContactMenu = Menu_AddContactMenuItem(&mi);

 

@@ -123,7 +123,7 @@ void InitTaskMenuItems()
 			CLISTMENUITEM mi = { 0 };

 			mi.position = 500060005;

 			mi.icolibItem = Skin_GetIconHandle(SKINICON_OTHER_HISTORY);

-			mi.pszName = LPGEN("Execute history task");

+			mi.name.a = LPGEN("Execute history task");

 			hTaskMainMenu = Menu_AddMainMenuItem(&mi);

 		}

 

@@ -141,7 +141,7 @@ void InitTaskMenuItems()
 			mi.flags = CMIF_TCHAR | CMIF_KEEPUNTRANSLATED;

 			mi.pszService = MS_HISTORY_EXECUTE_TASK;

 			mi.hParentMenu = hTaskMainMenu;

-			mi.ptszName = (TCHAR*)taskIt->taskName.c_str();

+			mi.name.t = (TCHAR*)taskIt->taskName.c_str();

 			HGENMENU menu = Menu_AddMainMenuItem(&mi);

 			Menu_ConfigureItem(menu, MCI_OPT_EXECPARAM, pos++);

 			taskMenus.push_back(menu);