ICQ: Use core auth icons.

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

4 files changed, 4 insertions, 20 deletions

diff --git a/protocols/IcqOscarJ/src/globals.h b/protocols/IcqOscarJ/src/globals.h
index ff421db79f..41f1162616 100644
--- a/protocols/IcqOscarJ/src/globals.h
+++ b/protocols/IcqOscarJ/src/globals.h
@@ -39,7 +39,6 @@ extern HINSTANCE hInst;
 extern DWORD MIRANDA_VERSION;

 

 extern HANDLE   hExtraXStatus;

-extern IconItem g_IconsList[];

 

 extern const int moodXStatus[];

 

diff --git a/protocols/IcqOscarJ/src/icq_menu.cpp b/protocols/IcqOscarJ/src/icq_menu.cpp
index 8c9620261d..13d7209f4e 100644
--- a/protocols/IcqOscarJ/src/icq_menu.cpp
+++ b/protocols/IcqOscarJ/src/icq_menu.cpp
@@ -121,7 +121,7 @@ void g_MenuInit(void)
 

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

 	mi.position = 1000030000;

-	mi.icolibItem = g_IconsList[ISI_AUTH_REQUEST].hIcolib;

+	mi.icolibItem = LoadSkinnedIconHandle(SKINICON_AUTH_REQUEST);

 	g_hContactMenuItems[ICMI_AUTH_REQUEST] = Menu_AddContactMenuItem(&mi);

 	

 	// "Grant authorization"

@@ -129,7 +129,7 @@ void g_MenuInit(void)
 

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

 	mi.position = 1000029999;

-	mi.icolibItem = g_IconsList[ISI_AUTH_GRANT].hIcolib;

+	mi.icolibItem = LoadSkinnedIconHandle(SKINICON_AUTH_GRANT);

 	g_hContactMenuItems[ICMI_AUTH_GRANT] = Menu_AddContactMenuItem(&mi);

 	

 	// "Revoke authorization"

@@ -137,7 +137,7 @@ void g_MenuInit(void)
 

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

 	mi.position = 1000029998;

-	mi.icolibItem = g_IconsList[ISI_AUTH_REVOKE].hIcolib;

+	mi.icolibItem = LoadSkinnedIconHandle(SKINICON_AUTH_REVOKE);

 	g_hContactMenuItems[ICMI_AUTH_REVOKE] = Menu_AddContactMenuItem(&mi);

 	

 	// "Add to server list"

@@ -145,7 +145,7 @@ void g_MenuInit(void)
 

 	mi.pszName = LPGEN("Add to server list");

 	mi.position = -2049999999;

-	mi.icolibItem = g_IconsList[ISI_ADD_TO_SERVLIST].hIcolib;

+	mi.icolibItem = LoadSkinnedIconHandle(SKINICON_AUTH_ADD);

 	g_hContactMenuItems[ICMI_ADD_TO_SERVLIST] = Menu_AddContactMenuItem(&mi);

 	

 	// "Show custom status details"

diff --git a/protocols/IcqOscarJ/src/init.cpp b/protocols/IcqOscarJ/src/init.cpp
index 58f71046f4..fd428c02ed 100644
--- a/protocols/IcqOscarJ/src/init.cpp
+++ b/protocols/IcqOscarJ/src/init.cpp
@@ -81,14 +81,6 @@ static int icqProtoUninit( PROTO_INTERFACE* ppro )
 	return 0;

 }

 

-IconItem g_IconsList[4] =

-{

-	{ LPGEN("Request authorization"), "req_auth",      IDI_AUTH_ASK     },

-	{ LPGEN("Grant authorization"),   "grant_auth",    IDI_AUTH_GRANT   },

-	{ LPGEN("Revoke authorization"),  "revoke_auth",   IDI_AUTH_REVOKE  },

-	{ LPGEN("Add to server list"),    "add_to_server", IDI_SERVLIST_ADD }

-};

-

 int ModuleLoad(WPARAM wParam, LPARAM lParam)

 {

 	bPopupService = ServiceExists(MS_POPUP_ADDPOPUP);

@@ -117,9 +109,6 @@ extern "C" int __declspec(dllexport) Load(void)
 	// Register static services

 	CreateServiceFunction(ICQ_DB_GETEVENTTEXT_MISSEDMESSAGE, icq_getEventTextMissedMessage);

 

-	// Define global icons

-	Icon_Register(hInst, "Protocols", g_IconsList, SIZEOF(g_IconsList), ICQ_PROTOCOL_NAME);

-

 	// Init extra statuses

 	InitXStatusIcons();

 	HookEvent(ME_SKIN2_ICONSCHANGED, OnReloadIcons);

diff --git a/protocols/IcqOscarJ/src/resource.h b/protocols/IcqOscarJ/src/resource.h
index 9e373e27c9..34b265104e 100644
--- a/protocols/IcqOscarJ/src/resource.h
+++ b/protocols/IcqOscarJ/src/resource.h
@@ -11,10 +11,6 @@
 #define IDD_OPT_ICQCONTACTS             109

 #define IDD_OPT_ICQFEATURES             110

 #define IDD_OPT_ICQPRIVACY              111

-#define IDI_AUTH_ASK                    150

-#define IDI_AUTH_GRANT                  151

-#define IDI_AUTH_REVOKE                 152

-#define IDI_SERVLIST_ADD                160

 #define IDD_INFO_ICQ                    240

 #define IDD_ICQADVANCEDSEARCH           242

 #define IDD_ICQUPLOADLIST               253