finally CLISTEVENT removed completely

git-svn-id: http://svn.miranda-ng.org/main/trunk@14430 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

1 files changed, 24 insertions, 24 deletions

diff --git a/protocols/VKontakte/src/vk_proto.cpp b/protocols/VKontakte/src/vk_proto.cpp
index 1ab461cc26..bd1bf48bd5 100644
--- a/protocols/VKontakte/src/vk_proto.cpp
+++ b/protocols/VKontakte/src/vk_proto.cpp
@@ -191,42 +191,42 @@ void CVkProto::InitMenus()
 	CreateProtoService(PS_SETSTATUSMSG, &CVkProto::SvcSetStatusMsg);

 	CreateProtoService(PS_WALLPOST, &CVkProto::SvcWallPost);

 		

-	CLISTMENUITEM mi = { 0 };

-	mi.hParentMenu = Menu_GetProtocolRoot(m_szModuleName);

+	TMO_MenuItem mi = { 0 };

+	mi.root = Menu_GetProtocolRoot(m_szModuleName);

 

 	// Proto menu

 	mi.pszService = PS_CREATECHAT;

 	mi.position = 10009 + PMI_CREATECHAT;

-	mi.icolibItem = Skin_GetIconHandle(SKINICON_CHAT_JOIN);

+	mi.hIcolibItem = Skin_GetIconHandle(SKINICON_CHAT_JOIN);

 	mi.name.a = LPGEN("Create new chat");

 	g_hProtoMenuItems[PMI_CREATECHAT] = Menu_AddProtoMenuItem(&mi, m_szModuleName);

 

 	mi.pszService = PS_SETSTATUSMSG;

 	mi.position = 10009 + PMI_SETSTATUSMSG;

-	mi.icolibItem = IcoLib_GetIconByHandle(GetIconHandle(IDI_STATUS));

+	mi.hIcolibItem = IcoLib_GetIconByHandle(GetIconHandle(IDI_STATUS));

 	mi.name.a = LPGEN("Status message");

 	g_hProtoMenuItems[PMI_SETSTATUSMSG] = Menu_AddProtoMenuItem(&mi, m_szModuleName);

 

 	mi.pszService = PS_WALLPOST;

 	mi.position = 10009 + PMI_WALLPOST;

-	mi.icolibItem = IcoLib_GetIconByHandle(GetIconHandle(IDI_WALL));

+	mi.hIcolibItem = IcoLib_GetIconByHandle(GetIconHandle(IDI_WALL));

 	mi.name.a = LPGEN("Send message to my wall");

 	g_hProtoMenuItems[PMI_WALLPOST] = Menu_AddProtoMenuItem(&mi, m_szModuleName);

 

 	mi.pszService = PS_LOADVKNEWS;

 	mi.position = 10009 + PMI_LOADVKNEWS;

-	mi.icolibItem = IcoLib_GetIconByHandle(GetIconHandle(IDI_NOTIFICATION));

+	mi.hIcolibItem = IcoLib_GetIconByHandle(GetIconHandle(IDI_NOTIFICATION));

 	mi.name.a = LPGEN("Load news from VK");

 	g_hProtoMenuItems[PMI_LOADVKNEWS] = Menu_AddProtoMenuItem(&mi, m_szModuleName);

 	

 	mi.pszService = PS_VISITPROFILE;

 	mi.position = 10009 + PMI_VISITPROFILE;

-	mi.icolibItem = IcoLib_GetIconByHandle(GetIconHandle(IDI_VISITPROFILE));

+	mi.hIcolibItem = IcoLib_GetIconByHandle(GetIconHandle(IDI_VISITPROFILE));

 	mi.name.a = LPGEN("Visit profile");

 	g_hProtoMenuItems[PMI_VISITPROFILE] = Menu_AddProtoMenuItem(&mi, m_szModuleName);

 

 	// Contact Menu Items

-	mi.hParentMenu = NULL;

+	mi.root = NULL;

 	mi.flags = CMIF_TCHAR;

 

 	mi.pszService = PS_VISITPROFILE;

@@ -236,94 +236,94 @@ void CVkProto::InitMenus()
 

 	mi.pszService = PS_WALLPOST;

 	mi.position = -200001000 + CMI_WALLPOST;

-	mi.icolibItem = IcoLib_GetIconByHandle(GetIconHandle(IDI_WALL));

+	mi.hIcolibItem = IcoLib_GetIconByHandle(GetIconHandle(IDI_WALL));

 	mi.name.t = LPGENT("Send message to user\'s wall");

 	g_hContactMenuItems[CMI_WALLPOST] = Menu_AddContactMenuItem(&mi, m_szModuleName);

 

 	mi.pszService = PS_ADDASFRIEND;

 	mi.position = -200001000 + CMI_ADDASFRIEND;

-	mi.icolibItem = IcoLib_GetIconByHandle(GetIconHandle(IDI_FRIENDADD));

+	mi.hIcolibItem = IcoLib_GetIconByHandle(GetIconHandle(IDI_FRIENDADD));

 	mi.name.t = LPGENT("Add as friend");

 	g_hContactMenuItems[CMI_ADDASFRIEND] = Menu_AddContactMenuItem(&mi, m_szModuleName);

 

 	mi.pszService = PS_DELETEFRIEND;

 	mi.position = -200001000 + CMI_DELETEFRIEND;

-	mi.icolibItem = IcoLib_GetIconByHandle(GetIconHandle(IDI_FRIENDDEL));

+	mi.hIcolibItem = IcoLib_GetIconByHandle(GetIconHandle(IDI_FRIENDDEL));

 	mi.name.t = LPGENT("Delete from friend list");

 	g_hContactMenuItems[CMI_DELETEFRIEND] = Menu_AddContactMenuItem(&mi, m_szModuleName);

 

 	mi.pszService = PS_BANUSER;

 	mi.position = -200001000 + CMI_BANUSER;

-	mi.icolibItem = IcoLib_GetIconByHandle(GetIconHandle(IDI_BAN));

+	mi.hIcolibItem = IcoLib_GetIconByHandle(GetIconHandle(IDI_BAN));

 	mi.name.t = LPGENT("Ban user");

 	g_hContactMenuItems[CMI_BANUSER] = Menu_AddContactMenuItem(&mi, m_szModuleName);

 

 	mi.pszService = PS_REPORTABUSE;

 	mi.position = -200001000 + CMI_REPORTABUSE;

-	mi.icolibItem = IcoLib_GetIconByHandle(GetIconHandle(IDI_ABUSE));

+	mi.hIcolibItem = IcoLib_GetIconByHandle(GetIconHandle(IDI_ABUSE));

 	mi.name.t = LPGENT("Report abuse");

 	g_hContactMenuItems[CMI_REPORTABUSE] = Menu_AddContactMenuItem(&mi, m_szModuleName);

 

 	mi.pszService = PS_DESTROYKICKCHAT;

 	mi.position = -200001000 + CMI_DESTROYKICKCHAT;

-	mi.icolibItem = IcoLib_GetIconByHandle(GetIconHandle(IDI_FRIENDDEL));

+	mi.hIcolibItem = IcoLib_GetIconByHandle(GetIconHandle(IDI_FRIENDDEL));

 	mi.name.t = LPGENT("Destroy room");

 	g_hContactMenuItems[CMI_DESTROYKICKCHAT] = Menu_AddContactMenuItem(&mi, m_szModuleName);

 

 	mi.pszService = PS_OPENBROADCAST;

 	mi.position = -200001000 + CMI_OPENBROADCAST;

-	mi.icolibItem = IcoLib_GetIconByHandle(GetIconHandle(IDI_BROADCAST));

+	mi.hIcolibItem = IcoLib_GetIconByHandle(GetIconHandle(IDI_BROADCAST));

 	mi.name.t = LPGENT("Open broadcast");

 	g_hContactMenuItems[CMI_OPENBROADCAST] = Menu_AddContactMenuItem(&mi, m_szModuleName);

 

 	mi.pszService = PS_LOADVKNEWS;

 	mi.position = -200001000 + CMI_LOADVKNEWS;

-	mi.icolibItem = IcoLib_GetIconByHandle(GetIconHandle(IDI_NOTIFICATION));

+	mi.hIcolibItem = IcoLib_GetIconByHandle(GetIconHandle(IDI_NOTIFICATION));

 	mi.name.t = LPGENT("Load news from VK");

 	g_hContactMenuItems[CMI_LOADVKNEWS] = Menu_AddContactMenuItem(&mi, m_szModuleName);

 

 	// Sync history menu

 	mi.pszService = PS_GETSERVERHISTORY;

 	mi.position = -200001000 + CMI_GETSERVERHISTORY;

-	mi.icolibItem = IcoLib_GetIconByHandle(GetIconHandle(IDI_HISTORY));

+	mi.hIcolibItem = IcoLib_GetIconByHandle(GetIconHandle(IDI_HISTORY));

 	mi.name.t = LPGENT("Reload messages from vk.com...");

 	g_hContactMenuItems[CMI_GETSERVERHISTORY] = Menu_AddContactMenuItem(&mi, m_szModuleName);

 		

-	mi.hParentMenu = g_hContactMenuItems[CMI_GETSERVERHISTORY];

+	mi.root = g_hContactMenuItems[CMI_GETSERVERHISTORY];

 

 	mi.pszService = PS_GETSERVERHISTORYLAST1DAY;

 	mi.position = -200001000 + CMI_GETSERVERHISTORY + 100 + CHMI_GETSERVERHISTORYLAST1DAY;

-	mi.icolibItem = IcoLib_GetIconByHandle(GetIconHandle(IDI_HISTORY));

+	mi.hIcolibItem = IcoLib_GetIconByHandle(GetIconHandle(IDI_HISTORY));

 	mi.name.t = LPGENT("for last 1 day");

 	g_hContactHistoryMenuItems[CHMI_GETSERVERHISTORYLAST1DAY] = Menu_AddContactMenuItem(&mi, m_szModuleName);

 

 	mi.pszService = PS_GETSERVERHISTORYLAST3DAY;

 	mi.position = -200001000 + CMI_GETSERVERHISTORY + 100 + CHMI_GETSERVERHISTORYLAST3DAY;

-	mi.icolibItem = IcoLib_GetIconByHandle(GetIconHandle(IDI_HISTORY));

+	mi.hIcolibItem = IcoLib_GetIconByHandle(GetIconHandle(IDI_HISTORY));

 	mi.name.t = LPGENT("for last 3 days");

 	g_hContactHistoryMenuItems[CHMI_GETSERVERHISTORYLAST3DAY] = Menu_AddContactMenuItem(&mi, m_szModuleName);

 

 	mi.pszService = PS_GETSERVERHISTORYLAST7DAY;

 	mi.position = -200001000 + CMI_GETSERVERHISTORY + 100 + CHMI_GETSERVERHISTORYLAST7DAY;

-	mi.icolibItem = IcoLib_GetIconByHandle(GetIconHandle(IDI_HISTORY));

+	mi.hIcolibItem = IcoLib_GetIconByHandle(GetIconHandle(IDI_HISTORY));

 	mi.name.t = LPGENT("for last week");

 	g_hContactHistoryMenuItems[CHMI_GETSERVERHISTORYLAST7DAY] = Menu_AddContactMenuItem(&mi, m_szModuleName);

 

 	mi.pszService = PS_GETSERVERHISTORYLAST30DAY;

 	mi.position = -200001000 + CMI_GETSERVERHISTORY + 100 + CHMI_GETSERVERHISTORYLAST30DAY;

-	mi.icolibItem = IcoLib_GetIconByHandle(GetIconHandle(IDI_HISTORY));

+	mi.hIcolibItem = IcoLib_GetIconByHandle(GetIconHandle(IDI_HISTORY));

 	mi.name.t = LPGENT("for last 30 days");

 	g_hContactHistoryMenuItems[CHMI_GETSERVERHISTORYLAST30DAY] = Menu_AddContactMenuItem(&mi, m_szModuleName);

 

 	mi.pszService = PS_GETSERVERHISTORYLAST90DAY;

 	mi.position = -200001000 + CMI_GETSERVERHISTORY + 100 + CHMI_GETSERVERHISTORYLAST90DAY;

-	mi.icolibItem = IcoLib_GetIconByHandle(GetIconHandle(IDI_HISTORY));

+	mi.hIcolibItem = IcoLib_GetIconByHandle(GetIconHandle(IDI_HISTORY));

 	mi.name.t = LPGENT("for last 90 days");

 	g_hContactHistoryMenuItems[CHMI_GETSERVERHISTORYLAST90DAY] = Menu_AddContactMenuItem(&mi, m_szModuleName);

 

 	mi.pszService = PS_GETALLSERVERHISTORY;

 	mi.position = -200001000 + CMI_GETSERVERHISTORY + 100 + CHMI_GETALLSERVERHISTORY;

-	mi.icolibItem = IcoLib_GetIconByHandle(GetIconHandle(IDI_HISTORY));

+	mi.hIcolibItem = IcoLib_GetIconByHandle(GetIconHandle(IDI_HISTORY));

 	mi.name.t = LPGENT("for all time");

 	g_hContactHistoryMenuItems[CHMI_GETALLSERVERHISTORY] = Menu_AddContactMenuItem(&mi, m_szModuleName);

 }