diff options
| author | George Hazan <george.hazan@gmail.com> | 2015-06-28 17:41:48 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2015-06-28 17:41:48 +0000 |
| commit | 59cd198e89782263777c57dcd54704ecb1e10212 (patch) | |
| tree | 9515cc2c31c1254c330e79906bb669279af9b8a5 /protocols/SkypeWeb/src/skype_menus.cpp | |
| parent | ca2afc50a432cefe892c6877710642bce6bd57c9 (diff) | |
finally CLISTEVENT removed completely
git-svn-id: http://svn.miranda-ng.org/main/trunk@14430 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/SkypeWeb/src/skype_menus.cpp')
| -rw-r--r-- | protocols/SkypeWeb/src/skype_menus.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/protocols/SkypeWeb/src/skype_menus.cpp b/protocols/SkypeWeb/src/skype_menus.cpp index 15700ec21a..8400cc483a 100644 --- a/protocols/SkypeWeb/src/skype_menus.cpp +++ b/protocols/SkypeWeb/src/skype_menus.cpp @@ -60,14 +60,14 @@ void CSkypeProto::InitMenus() //hChooserMenu = Menu_AddObject("SkypeAccountChooser", LPGEN("Skype menu chooser"), 0, "Skype/MenuChoose");
- CLISTMENUITEM mi = { 0 };
+ TMO_MenuItem mi = { 0 };
mi.flags = CMIF_TCHAR;
// Request authorization
mi.pszService = MODULE"/RequestAuth";
mi.name.t = LPGENT("Request authorization");
mi.position = CMI_POSITION + CMI_AUTH_REQUEST;
- mi.icolibItem = ::Skin_GetIconHandle(SKINICON_AUTH_REQUEST);
+ mi.hIcolibItem = ::Skin_GetIconHandle(SKINICON_AUTH_REQUEST);
ContactMenuItems[CMI_AUTH_REQUEST] = Menu_AddContactMenuItem(&mi);
CreateServiceFunction(mi.pszService, GlobalService<&CSkypeProto::OnRequestAuth>);
@@ -75,28 +75,28 @@ void CSkypeProto::InitMenus() mi.pszService = MODULE"/GrantAuth";
mi.name.t = LPGENT("Grant authorization");
mi.position = CMI_POSITION + CMI_AUTH_GRANT;
- mi.icolibItem = ::Skin_GetIconHandle(SKINICON_AUTH_GRANT);
+ mi.hIcolibItem = ::Skin_GetIconHandle(SKINICON_AUTH_GRANT);
ContactMenuItems[CMI_AUTH_GRANT] = Menu_AddContactMenuItem(&mi);
CreateServiceFunction(mi.pszService, GlobalService<&CSkypeProto::OnGrantAuth>);
mi.pszService = MODULE"/GetHistory";
mi.name.t = LPGENT("Get server history");
mi.position = CMI_POSITION + CMI_GETSERVERHISTORY;
- mi.icolibItem = GetIconHandle("synchistory");
+ mi.hIcolibItem = GetIconHandle("synchistory");
ContactMenuItems[CMI_GETSERVERHISTORY] = Menu_AddContactMenuItem(&mi);
CreateServiceFunction(mi.pszService, GlobalService<&CSkypeProto::GetContactHistory>);
mi.pszService = MODULE"/BlockContact";
mi.name.t = LPGENT("Block contact");
mi.position = CMI_POSITION + CMI_BLOCK;
- mi.icolibItem = GetIconHandle("user_block");
+ mi.hIcolibItem = GetIconHandle("user_block");
ContactMenuItems[CMI_BLOCK] = Menu_AddContactMenuItem(&mi);
CreateServiceFunction(mi.pszService, GlobalService<&CSkypeProto::BlockContact>);
mi.pszService = MODULE"/UnblockContact";
mi.name.t = LPGENT("Unblock contact");
mi.position = CMI_POSITION + CMI_UNBLOCK;
- mi.icolibItem = GetIconHandle("user_unblock");
+ mi.hIcolibItem = GetIconHandle("user_unblock");
ContactMenuItems[CMI_UNBLOCK] = Menu_AddContactMenuItem(&mi);
CreateServiceFunction(mi.pszService, GlobalService<&CSkypeProto::UnblockContact>);
}
@@ -111,22 +111,22 @@ int CSkypeProto::OnInitStatusMenu() HGENMENU hStatusMenuRoot = Menu_GetProtocolRoot(m_szModuleName);
if (!hStatusMenuRoot)
{
- CLISTMENUITEM mi = { 0 };
+ TMO_MenuItem mi = { 0 };
mi.name.t = m_tszUserName;
mi.position = -1999901006;
mi.flags = CMIF_TCHAR | CMIF_KEEPUNTRANSLATED;
- mi.icolibItem = Skin_GetIconHandle("main");
+ mi.hIcolibItem = Skin_GetIconHandle("main");
hStatusMenuRoot = Menu_AddProtoMenuItem(&mi);
}
- CLISTMENUITEM mi = { 0 };
- mi.hParentMenu = hStatusMenuRoot;
+ TMO_MenuItem mi = { 0 };
+ mi.root = hStatusMenuRoot;
mi.pszService = "/CreateNewChat";
CreateProtoService(mi.pszService, &CSkypeProto::SvcCreateChat);
mi.name.a = LPGEN("Create new chat");
mi.position = SMI_POSITION + SMI_CREATECHAT;
- mi.icolibItem = GetIconHandle("conference");
+ mi.hIcolibItem = GetIconHandle("conference");
Menu_AddProtoMenuItem(&mi, m_szModuleName);
return 0;
}
\ No newline at end of file |