From 857c54d336dade4cbcc83d33282624bddb0de19d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20P=C3=B6sel?= Date: Fri, 14 Jun 2013 16:21:42 +0000 Subject: Jabber, Skype, Tlen: Use core auth icons. git-svn-id: http://svn.miranda-ng.org/main/trunk@4941 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/Skype/src/resource.h | 3 --- protocols/Skype/src/skype_icons.cpp | 3 --- protocols/Skype/src/skype_menus.cpp | 6 +++--- 3 files changed, 3 insertions(+), 9 deletions(-) (limited to 'protocols/Skype/src') diff --git a/protocols/Skype/src/resource.h b/protocols/Skype/src/resource.h index c0b6b8b23c..94c55c218c 100644 --- a/protocols/Skype/src/resource.h +++ b/protocols/Skype/src/resource.h @@ -12,9 +12,6 @@ #define IDD_CHATROOM_INVITE 40 #define IDI_ICON 101 #define IDR_RUNTIME 102 -#define IDI_AUTH_GRANT 103 -#define IDI_AUTH_REQUEST 104 -#define IDI_AUTH_REVOKE 105 #define IDD_PASSWORD_REQUEST 106 #define IDR_KEY 107 #define IDI_CALL 108 diff --git a/protocols/Skype/src/skype_icons.cpp b/protocols/Skype/src/skype_icons.cpp index edd4f0d316..25ac88589c 100644 --- a/protocols/Skype/src/skype_icons.cpp +++ b/protocols/Skype/src/skype_icons.cpp @@ -7,9 +7,6 @@ _tag_iconList CSkypeProto::IconList[] = { LPGENT("Call"), "call", IDI_CALL }, { LPGENT("Invite to conference"), "confInvite", IDI_CONF_INVITE }, { LPGENT("Spawn conference"), "confSpawn", IDI_CONF_SPAWN }, - { LPGENT("Revoke authorization"), "authRevoke", IDI_AUTH_REVOKE }, - { LPGENT("Request authorization"), "authRequest", IDI_AUTH_REQUEST }, - { LPGENT("Grant authorization"), "authGrant", IDI_AUTH_GRANT }, { LPGENT("Send contact"), "sendContacts", IDI_SEND_CONTACTS }, }; diff --git a/protocols/Skype/src/skype_menus.cpp b/protocols/Skype/src/skype_menus.cpp index 74d256d631..af4fbc783c 100644 --- a/protocols/Skype/src/skype_menus.cpp +++ b/protocols/Skype/src/skype_menus.cpp @@ -140,7 +140,7 @@ void CSkypeProto::InitMenus() mi.pszService = "Skype/RevokeAuth"; mi.ptszName = LPGENT("Revoke authorization"); mi.position = -2000001000 - CMI_AUTH_REVOKE; - mi.icolibItem = CSkypeProto::GetIconHandle("authRevoke"); + mi.icolibItem = ::LoadSkinnedIconHandle(SKINICON_AUTH_REVOKE); CSkypeProto::contactMenuItems[CMI_AUTH_REVOKE] = ::Menu_AddContactMenuItem(&mi); CSkypeProto::contactMenuServices[CMI_AUTH_REVOKE] = ::CreateServiceFunction(mi.pszService, GlobalService<&CSkypeProto::RevokeAuth>); @@ -148,7 +148,7 @@ void CSkypeProto::InitMenus() mi.pszService = "Skype/RequestAuth"; mi.ptszName = LPGENT("Request authorization"); mi.position = -2000001000 - CMI_AUTH_REQUEST; - mi.icolibItem = CSkypeProto::GetIconHandle("authRequest"); + mi.icolibItem = ::LoadSkinnedIconHandle(SKINICON_AUTH_REQUEST); CSkypeProto::contactMenuItems[CMI_AUTH_REQUEST] = ::Menu_AddContactMenuItem(&mi); CSkypeProto::contactMenuServices[CMI_AUTH_REQUEST] = ::CreateServiceFunction(mi.pszService, GlobalService<&CSkypeProto::RequestAuth>); @@ -156,7 +156,7 @@ void CSkypeProto::InitMenus() mi.pszService = "Skype/GrantAuth"; mi.ptszName = LPGENT("Grant authorization"); mi.position = -2000001000 - CMI_AUTH_GRANT; - mi.icolibItem = CSkypeProto::GetIconHandle("authGrant"); + mi.icolibItem = ::LoadSkinnedIconHandle(SKINICON_AUTH_GRANT); CSkypeProto::contactMenuItems[CMI_AUTH_GRANT] = ::Menu_AddContactMenuItem(&mi); CSkypeProto::contactMenuServices[CMI_AUTH_GRANT] = ::CreateServiceFunction(mi.pszService, GlobalService<&CSkypeProto::GrantAuth>); } -- cgit v1.2.3