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

diff --git a/plugins/Clist_modern/src/modern_clisttray.cpp b/plugins/Clist_modern/src/modern_clisttray.cpp
index ac20d89b61..049e105b36 100644
--- a/plugins/Clist_modern/src/modern_clisttray.cpp
+++ b/plugins/Clist_modern/src/modern_clisttray.cpp
@@ -317,44 +317,44 @@ void InitTrayMenus(void)
 	CLISTMENUITEM mi = { 0 };

 	mi.position = 900000;

 	mi.pszService = "CloseAction";

-	mi.pszName = LPGEN("E&xit");

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

 	mi.icolibItem = Skin_GetIconHandle(SKINICON_OTHER_EXIT);

 	Menu_AddTrayMenuItem(&mi);

 

 	mi.position = 100000;

 	mi.pszService = MS_CLIST_SHOWHIDE;

-	mi.pszName = LPGEN("&Hide/show");

+	mi.name.a = LPGEN("&Hide/show");

 	mi.icolibItem = Skin_GetIconHandle(SKINICON_OTHER_SHOWHIDE);

 	hTrayHideShowMainMenuItem = Menu_AddTrayMenuItem(&mi);

 

 	mi.position = 200000;

 	mi.icolibItem = Skin_GetIconHandle(SKINICON_OTHER_FINDUSER);

 	mi.pszService = "FindAdd/FindAddCommand";

-	mi.pszName = LPGEN("&Find/add contacts...");

+	mi.name.a = LPGEN("&Find/add contacts...");

 	Menu_AddTrayMenuItem(&mi);

 

 	mi.position = 300000;

 	mi.icolibItem = Skin_GetIconHandle(SKINICON_OTHER_MAINMENU); // eternity #004

 	mi.pszService = "FakeService_1";

-	mi.pszName = LPGEN("&Main menu");

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

 	hTrayMainMenuItemProxy = Menu_AddTrayMenuItem(&mi);

 

 	mi.position = 300100;

 	mi.pszService = "FakeService_2";

 	mi.icolibItem = Skin_GetIconHandle(SKINICON_OTHER_STATUS); // eternity #004

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

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

 	hTrayStatusMenuItemProxy = Menu_AddTrayMenuItem(&mi);

 

 	mi.position = 400000;

 	mi.icolibItem = Skin_GetIconHandle(SKINICON_OTHER_OPTIONS);

 	mi.pszService = "Options/OptionsCommand";

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

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

 	Menu_AddTrayMenuItem(&mi);

 

 	mi.position = 500000;

 	mi.icolibItem = Skin_GetIconHandle(SKINICON_OTHER_MIRANDA);

 	mi.pszService = "Help/AboutCommand";

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

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

 	Menu_AddTrayMenuItem(&mi);

 

 	hMainMenu = (HMENU)CallService(MS_CLIST_MENUGETMAIN, 0, 0);