Jabber, Skype, Tlen: Use core auth icons.

git-svn-id: http://svn.miranda-ng.org/main/trunk@4941 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

7 files changed, 3 insertions, 12 deletions

diff --git a/protocols/Skype/res/Resource.rc b/protocols/Skype/res/Resource.rc
index 96c5af72ad..8e4fc6c378 100644
--- a/protocols/Skype/res/Resource.rc
+++ b/protocols/Skype/res/Resource.rc
@@ -367,9 +367,6 @@ END
 // Icon with lowest ID value placed first to ensure application icon

 // remains consistent on all systems.

 IDI_ICON                ICON                    "main.ico"

-IDI_AUTH_GRANT          ICON                    "auth_grant.ico"

-IDI_AUTH_REQUEST        ICON                    "auth_request.ico"

-IDI_AUTH_REVOKE         ICON                    "auth_revoke.ico"

 IDI_CALL                ICON                    "call.ico"

 IDI_CONF_INVITE         ICON                    "conf_invite.ico"

 IDI_CONF_SPAWN          ICON                    "conf_spawn.ico"

diff --git a/protocols/Skype/res/auth_grant.ico b/protocols/Skype/res/auth_grant.ico
deleted file mode 100644
index abe4554b84..0000000000
--- a/protocols/Skype/res/auth_grant.ico
+++ /dev/null
diff --git a/protocols/Skype/res/auth_request.ico b/protocols/Skype/res/auth_request.ico
deleted file mode 100644
index 5bed45e9f8..0000000000
--- a/protocols/Skype/res/auth_request.ico
+++ /dev/null
diff --git a/protocols/Skype/res/auth_revoke.ico b/protocols/Skype/res/auth_revoke.ico
deleted file mode 100644
index 43f17b0e7f..0000000000
--- a/protocols/Skype/res/auth_revoke.ico
+++ /dev/null
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>);

 }