Jabber, Skype, Tlen: Use core auth icons.

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

20 files changed, 9 insertions, 36 deletions

diff --git a/protocols/JabberG/res/add2roster.ico b/protocols/JabberG/res/add2roster.ico
deleted file mode 100644
index 628ed35d1f..0000000000
--- a/protocols/JabberG/res/add2roster.ico
+++ /dev/null
diff --git a/protocols/JabberG/res/auth_revoke.ico b/protocols/JabberG/res/auth_revoke.ico
deleted file mode 100644
index 43f17b0e7f..0000000000
--- a/protocols/JabberG/res/auth_revoke.ico
+++ /dev/null
diff --git a/protocols/JabberG/res/grant.ico b/protocols/JabberG/res/grant.ico
deleted file mode 100644
index abe4554b84..0000000000
--- a/protocols/JabberG/res/grant.ico
+++ /dev/null
diff --git a/protocols/JabberG/res/jabber.rc b/protocols/JabberG/res/jabber.rc
index 7808407ab0..e453700a3a 100644
--- a/protocols/JabberG/res/jabber.rc
+++ b/protocols/JabberG/res/jabber.rc
@@ -892,18 +892,14 @@ IDI_DISCO_FAIL          ICON                    "disco_fail.ico"
 IDI_GROUP               ICON                    "group.ico"

 IDI_KEYS                ICON                    "key.ico"

 IDI_ADDCONTACT          ICON                    "addcontact.ico"

-IDI_ADDROSTER           ICON                    "add2roster.ico"

 IDI_AGENTS              ICON                    "roster.ico"

 IDI_VCARD               ICON                    "pages.ico"

 IDI_DELETE              ICON                    "delete.ico"

 IDI_EDIT                ICON                    "rename.ico"

-IDI_GRANT               ICON                    "grant.ico"

 IDI_OPEN                ICON                    "open.ico"

-IDI_REQUEST             ICON                    "request.ico"

 IDI_USER2ROOM           ICON                    "user2room.ico"

 IDI_SAVE                ICON                    "save.ico"

 IDI_LOGIN               ICON                    "login.ico"

-IDI_AUTHREVOKE          ICON                    "auth_revoke.ico"

 IDI_REFRESH             ICON                    "refresh.ico"

 IDI_COMMAND             ICON                    "command.ico"

 IDI_BOOKMARKS           ICON                    "bookmarks.ico"

diff --git a/protocols/JabberG/res/request.ico b/protocols/JabberG/res/request.ico
deleted file mode 100644
index 5bed45e9f8..0000000000
--- a/protocols/JabberG/res/request.ico
+++ /dev/null
diff --git a/protocols/JabberG/src/jabber_icolib.cpp b/protocols/JabberG/src/jabber_icolib.cpp
index e1a582c51b..698276b8a5 100644
--- a/protocols/JabberG/src/jabber_icolib.cpp
+++ b/protocols/JabberG/src/jabber_icolib.cpp
@@ -485,11 +485,7 @@ static IconItem sharedIconList1[] =
 	{   LPGEN("Registered transports"), "transport_loc",    IDI_TRANSPORTL         },

 	{   LPGEN("Change password"),       "key",              IDI_KEYS               },

 	{   LPGEN("Personal vCard"),        "vcard",            IDI_VCARD              },

-	{   LPGEN("Request authorization"), "Request",          IDI_REQUEST            },

-	{   LPGEN("Grant authorization"),   "Grant",            IDI_GRANT              },

-	{   LPGEN("Revoke authorization"),  "Revoke",           IDI_AUTHREVOKE         },

 	{   LPGEN("Convert to room"),       "convert",          IDI_USER2ROOM          },

-	{   LPGEN("Add to roster"),         "addroster",        IDI_ADDROSTER          },

 	{   LPGEN("Login/logout"),          "trlogonoff",       IDI_LOGIN              },

 	{   LPGEN("Resolve nicks"),         "trresolve",        IDI_REFRESH            },

 	{   LPGEN("Send note"),             "sendnote",         IDI_SEND_NOTE,         },

diff --git a/protocols/JabberG/src/jabber_menu.cpp b/protocols/JabberG/src/jabber_menu.cpp
index a7d5065054..27fe6b7b40 100644
--- a/protocols/JabberG/src/jabber_menu.cpp
+++ b/protocols/JabberG/src/jabber_menu.cpp
@@ -206,7 +206,7 @@ void g_MenuInit(void)
 	// "Request authorization"

 	mi.pszName = LPGEN("Request authorization");

 	mi.position = -2000001000;

-	mi.icolibItem = g_GetIconHandle(IDI_REQUEST);

+	mi.icolibItem = LoadSkinnedIconHandle(SKINICON_AUTH_REQUEST);

 	mi.pszService = "Jabber/ReqAuth";

 	g_hMenuRequestAuth = Menu_AddContactMenuItem(&mi);

 	CreateServiceFunction(mi.pszService, JabberMenuHandleRequestAuth);

@@ -215,7 +215,7 @@ void g_MenuInit(void)
 	mi.pszService = "Jabber/GrantAuth";

 	mi.pszName = LPGEN("Grant authorization");

 	mi.position = -2000001001;

-	mi.icolibItem = g_GetIconHandle(IDI_GRANT);

+	mi.icolibItem = LoadSkinnedIconHandle(SKINICON_AUTH_GRANT);

 	g_hMenuGrantAuth = Menu_AddContactMenuItem(&mi);

 	CreateServiceFunction(mi.pszService, JabberMenuHandleGrantAuth);

 

@@ -223,7 +223,7 @@ void g_MenuInit(void)
 	mi.pszService = "Jabber/RevokeAuth";

 	mi.pszName = LPGEN("Revoke authorization");

 	mi.position = -2000001002;

-	mi.icolibItem = g_GetIconHandle(IDI_AUTHREVOKE);

+	mi.icolibItem = LoadSkinnedIconHandle(SKINICON_AUTH_REVOKE);

 	g_hMenuRevokeAuth = Menu_AddContactMenuItem(&mi);

 	CreateServiceFunction(mi.pszService, JabberMenuRevokeAuth);

 

@@ -239,7 +239,7 @@ void g_MenuInit(void)
 	mi.pszService = "Jabber/AddToRoster";

 	mi.pszName = LPGEN("Add to roster");

 	mi.position = -1999901005;

-	mi.icolibItem = g_GetIconHandle(IDI_ADDROSTER);

+	mi.icolibItem = LoadSkinnedIconHandle(SKINICON_AUTH_ADD);

 	g_hMenuRosterAdd = Menu_AddContactMenuItem(&mi);

 	CreateServiceFunction(mi.pszService, JabberMenuRosterAdd);

 

diff --git a/protocols/JabberG/src/resource.h b/protocols/JabberG/src/resource.h
index fa3b6a0408..bae55ddb9b 100644
--- a/protocols/JabberG/src/resource.h
+++ b/protocols/JabberG/src/resource.h
@@ -8,7 +8,6 @@
 #define IDD_OPT_REGISTER                105

 #define IDD_AGENTS                      106

 #define IDD_FORM                        107

-#define IDI_ADDROSTER                   108

 #define IDI_USER2ROOM                   109

 #define IDI_REFRESH                     110

 #define IDD_PASSWORD                    111

@@ -28,9 +27,7 @@
 #define IDD_CHANGEPASSWORD              136

 #define IDD_SEARCHUSER                  138

 #define IDD_OPT_JABBER2                 140

-#define IDI_REQUEST                     141

 #define IDD_GROUPCHAT                   141

-#define IDI_GRANT                       142

 #define IDI_KEYS                        144

 #define IDI_GROUP                       147

 #define IDD_GROUPCHAT_JOIN              148

@@ -44,7 +41,6 @@
 #define IDD_GROUPCHAT_INVITE_ACCEPT     184

 #define IDD_OPT_JABBER3                 185

 #define IDI_LOGIN                       186

-#define IDI_AUTHREVOKE                  187

 #define IDI_COMMAND                     188

 #define IDI_DISCO_OK                    190

 #define IDI_DISCO_FAIL                  191

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>);

 }

diff --git a/protocols/Tlen/res/auth_grant.ico b/protocols/Tlen/res/auth_grant.ico
deleted file mode 100644
index 22ce0e5c47..0000000000
--- a/protocols/Tlen/res/auth_grant.ico
+++ /dev/null
diff --git a/protocols/Tlen/res/auth_request.ico b/protocols/Tlen/res/auth_request.ico
deleted file mode 100644
index d2e379aa5f..0000000000
--- a/protocols/Tlen/res/auth_request.ico
+++ /dev/null
diff --git a/protocols/Tlen/res/tlen.rc b/protocols/Tlen/res/tlen.rc
index c105940f6a..ab7173bb2b 100644
--- a/protocols/Tlen/res/tlen.rc
+++ b/protocols/Tlen/res/tlen.rc
@@ -420,8 +420,6 @@ IDI_TLEN               ICON         "tlen.ico"
 IDI_MAIL               ICON         "mail.ico"

 IDI_MUC                ICON         "groupchats.ico"

 IDI_CHATS              ICON         "tlenchats.ico"

-IDI_GRANT              ICON         "auth_grant.ico"

-IDI_REQUEST            ICON         "auth_request.ico"

 IDI_VOICE              ICON         "voicechat.ico"

 IDI_MICROPHONE         ICON         "microphone.ico"

 IDI_SPEAKER            ICON         "speaker.ico"

diff --git a/protocols/Tlen/src/resource.h b/protocols/Tlen/src/resource.h
index 6f3b59b64d..4ce70c58b2 100644
--- a/protocols/Tlen/src/resource.h
+++ b/protocols/Tlen/src/resource.h
@@ -7,8 +7,6 @@
 #define IDI_MAIL			101

 #define IDI_MUC				102

 #define IDI_CHATS			103

-#define IDI_GRANT			104

-#define IDI_REQUEST			105

 #define IDI_VOICE			106

 #define IDI_MICROPHONE		107

 #define IDI_SPEAKER			108

diff --git a/protocols/Tlen/src/tlen.cpp b/protocols/Tlen/src/tlen.cpp
index 570b2d87e7..aeb79f6927 100644
--- a/protocols/Tlen/src/tlen.cpp
+++ b/protocols/Tlen/src/tlen.cpp
@@ -81,8 +81,6 @@ static IconItem iconList[] =
 	{ LPGEN("Tlen inbox"),             "MAIL",         IDI_MAIL       },

 	{ LPGEN("Group chats"),            "MUC",          IDI_MUC        },

 	{ LPGEN("Tlen chats"),             "CHATS",        IDI_CHATS      },

-	{ LPGEN("Grant authorization"),    "GRANT",        IDI_GRANT      },

-	{ LPGEN("Request authorization"),  "REQUEST",      IDI_REQUEST    },

 	{ LPGEN("Voice chat"),             "VOICE",        IDI_VOICE      },

 	{ LPGEN("Microphone"),             "MICROPHONE",   IDI_MICROPHONE },

 	{ LPGEN("Speaker"),                "SPEAKER",      IDI_SPEAKER    },

@@ -369,7 +367,7 @@ static void initMenuItems(TlenProtocol *proto)
 	CreateServiceFunction_Ex(text, proto, TlenContactMenuHandleRequestAuth);

 	mi.pszName = LPGEN("Request authorization");

 	mi.position = -2000001001;

-	mi.icolibItem = GetIconHandle(IDI_REQUEST);

+	mi.icolibItem = LoadSkinnedIconHandle(SKINICON_AUTH_REQUEST);

 	mi.pszService = text;

 	proto->hMenuContactRequestAuth = Menu_AddContactMenuItem(&mi);

 

@@ -378,7 +376,7 @@ static void initMenuItems(TlenProtocol *proto)
 	CreateServiceFunction_Ex(text, proto, TlenContactMenuHandleGrantAuth);

 	mi.pszName = LPGEN("Grant authorization");

 	mi.position = -2000001000;

-	mi.icolibItem = GetIconHandle(IDI_GRANT);

+	mi.icolibItem = LoadSkinnedIconHandle(SKINICON_AUTH_GRANT);

 	mi.pszService = text;

 	proto->hMenuContactGrantAuth = Menu_AddContactMenuItem(&mi);

 }