From 59cd198e89782263777c57dcd54704ecb1e10212 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Sun, 28 Jun 2015 17:41:48 +0000
Subject: finally CLISTEVENT removed completely

git-svn-id: http://svn.miranda-ng.org/main/trunk@14430 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 protocols/Twitter/src/proto.cpp | 6 +++---
 protocols/Twitter/src/theme.cpp | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'protocols/Twitter/src')

diff --git a/protocols/Twitter/src/proto.cpp b/protocols/Twitter/src/proto.cpp
index ba5ebc4672..0d65b25b0c 100644
--- a/protocols/Twitter/src/proto.cpp
+++ b/protocols/Twitter/src/proto.cpp
@@ -260,10 +260,10 @@ int TwitterProto::OnBuildStatusMenu(WPARAM, LPARAM)
 	mir_strcpy(text, m_szModuleName);
 	char *tDest = text + mir_strlen(text);
 
-	CLISTMENUITEM mi = { 0 };
+	TMO_MenuItem mi = { 0 };
 	mi.pszService = text;
 
-	mi.hParentMenu = hRoot;
+	mi.root = hRoot;
 	mi.flags = CMIF_TCHAR;
 	mi.position = 1001;
 	Menu_AddStatusMenuItem(&mi);
@@ -274,7 +274,7 @@ int TwitterProto::OnBuildStatusMenu(WPARAM, LPARAM)
 	mir_strcpy(tDest, "/Tweet");
 	mi.name.t = LPGENT("Send Tweet...");
 	mi.position = 200001;
-	mi.icolibItem = GetIconHandle("tweet");
+	mi.hIcolibItem = GetIconHandle("tweet");
 	Menu_AddStatusMenuItem(&mi);
 	return 0;
 }
diff --git a/protocols/Twitter/src/theme.cpp b/protocols/Twitter/src/theme.cpp
index 53606e35a5..30e88a23b0 100644
--- a/protocols/Twitter/src/theme.cpp
+++ b/protocols/Twitter/src/theme.cpp
@@ -86,18 +86,18 @@ void InitContactMenus()
 {
 	g_hMenuEvts[0] = HookEvent(ME_CLIST_PREBUILDCONTACTMENU, PrebuildContactMenu);
 
-	CLISTMENUITEM mi = { 0 };
+	TMO_MenuItem mi = { 0 };
 	mi.flags = CMIF_NOTOFFLINE | CMIF_TCHAR;
 
 	mi.position = -2000006000;
-	mi.icolibItem = GetIconHandle("reply");
+	mi.hIcolibItem = GetIconHandle("reply");
 	mi.name.t = LPGENT("Reply...");
 	mi.pszService = "Twitter/ReplyToTweet";
 	g_hMenuEvts[1] = CreateServiceFunction(mi.pszService, GlobalService<&TwitterProto::ReplyToTweet>);
 	g_hMenuItems[0] = Menu_AddContactMenuItem(&mi);
 
 	mi.position = -2000006000;
-	mi.icolibItem = GetIconHandle("homepage");
+	mi.hIcolibItem = GetIconHandle("homepage");
 	mi.name.t = LPGENT("Visit Homepage");
 	mi.pszService = "Twitter/VisitHomepage";
 	g_hMenuEvts[2] = CreateServiceFunction(mi.pszService, GlobalService<&TwitterProto::VisitHomepage>);
-- 
cgit v1.2.3