From ab4abbb7a60f941acab8f0566c6b619f68f1b489 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sat, 27 Jun 2015 11:09:19 +0000 Subject: - 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 --- protocols/Sametime/src/conference.cpp | 15 +++++---------- protocols/Sametime/src/sametime_session.cpp | 10 +++------- 2 files changed, 8 insertions(+), 17 deletions(-) (limited to 'protocols/Sametime/src') diff --git a/protocols/Sametime/src/conference.cpp b/protocols/Sametime/src/conference.cpp index 697a829421..3ac009dc6e 100644 --- a/protocols/Sametime/src/conference.cpp +++ b/protocols/Sametime/src/conference.cpp @@ -508,21 +508,16 @@ void CSametimeProto::InitConferenceMenu() CreateProtoService(MS_SAMETIME_MENULEAVECHAT, &CSametimeProto::onMenuLeaveChat); CreateProtoService(MS_SAMETIME_MENUCREATECHAT, &CSametimeProto::onMenuCreateChat); - char service[128]; - CLISTMENUITEM mi = { 0 }; mi.flags = CMIF_TCHAR | CMIF_NOTOFFLINE; - mi.pszContactOwner = m_szModuleName; - mi.ptszName = LPGENT("Leave conference"); - mir_snprintf(service, _countof(service), "%s%s", m_szModuleName, MS_SAMETIME_MENULEAVECHAT); - mi.pszService = service; + mi.name.t = LPGENT("Leave conference"); + mi.pszService = MS_SAMETIME_MENULEAVECHAT; mi.icolibItem = GetIconHandle(IDI_ICON_LEAVE); - hLeaveChatMenuItem = Menu_AddContactMenuItem(&mi); + hLeaveChatMenuItem = Menu_AddContactMenuItem(&mi, m_szModuleName); - mi.ptszName = LPGENT("Start conference"); - mir_snprintf(service, _countof(service), "%s%s", m_szModuleName, MS_SAMETIME_MENUCREATECHAT); - mi.pszService = service; + mi.name.t = LPGENT("Start conference"); + mi.pszService = MS_SAMETIME_MENUCREATECHAT; mi.icolibItem = GetIconHandle(IDI_ICON_INVITE); hCreateChatMenuItem = Menu_AddContactMenuItem(&mi); diff --git a/protocols/Sametime/src/sametime_session.cpp b/protocols/Sametime/src/sametime_session.cpp index 9994db0920..96826d75d9 100644 --- a/protocols/Sametime/src/sametime_session.cpp +++ b/protocols/Sametime/src/sametime_session.cpp @@ -560,15 +560,11 @@ void CSametimeProto::InitSessionMenu() CreateProtoService(MS_SAMETIME_MENUANNOUNCESESSION, &CSametimeProto::SessionAnnounce); - char service[128]; - CLISTMENUITEM mi = { 0 }; mi.flags = CMIF_TCHAR; mi.position = 2000060000; - mi.ptszName = LPGENT("Send announcement..."); - mir_snprintf(service, _countof(service), "%s%s", m_szModuleName, MS_SAMETIME_MENUANNOUNCESESSION); - mi.pszService = service; + mi.name.t = LPGENT("Send announcement..."); + mi.pszService = MS_SAMETIME_MENUANNOUNCESESSION; mi.icolibItem = GetIconHandle(IDI_ICON_ANNOUNCE); - mi.pszContactOwner = m_szModuleName; - Menu_AddContactMenuItem(&mi); + Menu_AddContactMenuItem(&mi, m_szModuleName); } -- cgit v1.2.3