From 59cd198e89782263777c57dcd54704ecb1e10212 Mon Sep 17 00:00:00 2001 From: George Hazan 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/Sametime/src/conference.cpp | 6 +++--- protocols/Sametime/src/sametime_session.cpp | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'protocols/Sametime/src') diff --git a/protocols/Sametime/src/conference.cpp b/protocols/Sametime/src/conference.cpp index 3ac009dc6e..0eebe780b6 100644 --- a/protocols/Sametime/src/conference.cpp +++ b/protocols/Sametime/src/conference.cpp @@ -508,17 +508,17 @@ void CSametimeProto::InitConferenceMenu() CreateProtoService(MS_SAMETIME_MENULEAVECHAT, &CSametimeProto::onMenuLeaveChat); CreateProtoService(MS_SAMETIME_MENUCREATECHAT, &CSametimeProto::onMenuCreateChat); - CLISTMENUITEM mi = { 0 }; + TMO_MenuItem mi = { 0 }; mi.flags = CMIF_TCHAR | CMIF_NOTOFFLINE; mi.name.t = LPGENT("Leave conference"); mi.pszService = MS_SAMETIME_MENULEAVECHAT; - mi.icolibItem = GetIconHandle(IDI_ICON_LEAVE); + mi.hIcolibItem = GetIconHandle(IDI_ICON_LEAVE); hLeaveChatMenuItem = Menu_AddContactMenuItem(&mi, m_szModuleName); mi.name.t = LPGENT("Start conference"); mi.pszService = MS_SAMETIME_MENUCREATECHAT; - mi.icolibItem = GetIconHandle(IDI_ICON_INVITE); + mi.hIcolibItem = GetIconHandle(IDI_ICON_INVITE); hCreateChatMenuItem = Menu_AddContactMenuItem(&mi); HookProtoEvent(ME_CLIST_PREBUILDCONTACTMENU, &CSametimeProto::PrebuildContactMenu); diff --git a/protocols/Sametime/src/sametime_session.cpp b/protocols/Sametime/src/sametime_session.cpp index 96826d75d9..4b49c436ea 100644 --- a/protocols/Sametime/src/sametime_session.cpp +++ b/protocols/Sametime/src/sametime_session.cpp @@ -560,11 +560,11 @@ void CSametimeProto::InitSessionMenu() CreateProtoService(MS_SAMETIME_MENUANNOUNCESESSION, &CSametimeProto::SessionAnnounce); - CLISTMENUITEM mi = { 0 }; + TMO_MenuItem mi = { 0 }; mi.flags = CMIF_TCHAR; mi.position = 2000060000; mi.name.t = LPGENT("Send announcement..."); mi.pszService = MS_SAMETIME_MENUANNOUNCESESSION; - mi.icolibItem = GetIconHandle(IDI_ICON_ANNOUNCE); + mi.hIcolibItem = GetIconHandle(IDI_ICON_ANNOUNCE); Menu_AddContactMenuItem(&mi, m_szModuleName); } -- cgit v1.2.3