Jabber, Skype, Tlen: Use core auth icons.

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

8 files changed, 4 insertions, 16 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