- extra icons services converted into functions;

- more Kill* functions exported;

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

6 files changed, 11 insertions, 14 deletions

diff --git a/protocols/AimOscar/src/theme.cpp b/protocols/AimOscar/src/theme.cpp
index 5564d4f421..cbcd33e7e4 100644
--- a/protocols/AimOscar/src/theme.cpp
+++ b/protocols/AimOscar/src/theme.cpp
@@ -164,8 +164,8 @@ void add_ES_icons(CAimProto* ppro)
 

 void InitExtraIcons(void)

 {

-	hExtraAT = ExtraIcon_Register("aimaccounttype", LPGEN("AIM Account Type"), "AIM_aol");

-	hExtraES = ExtraIcon_Register("aimextstatus", LPGEN("AIM Extended Status"), "AIM_hiptop");

+	hExtraAT = ExtraIcon_RegisterIcolib("aimaccounttype", LPGEN("AIM Account Type"), "AIM_aol");

+	hExtraES = ExtraIcon_RegisterIcolib("aimextstatus", LPGEN("AIM Extended Status"), "AIM_hiptop");

 }

 

 /////////////////////////////////////////////////////////////////////////////////////////

diff --git a/protocols/IcqOscarJ/src/init.cpp b/protocols/IcqOscarJ/src/init.cpp
index e922d09cfa..59794f946a 100644
--- a/protocols/IcqOscarJ/src/init.cpp
+++ b/protocols/IcqOscarJ/src/init.cpp
@@ -123,7 +123,7 @@ extern "C" int __declspec(dllexport) Load(void)
 

 	HookEvent(ME_SYSTEM_PRESHUTDOWN, OnPreShutdown);

 

-	hExtraXStatus = ExtraIcon_Register("xstatus", LPGEN("ICQ xStatus"), "icq_xstatus13");

+	hExtraXStatus = ExtraIcon_RegisterIcolib("xstatus", LPGEN("ICQ xStatus"), "icq_xstatus13");

 

 	g_MenuInit();

 	return 0;

diff --git a/protocols/JabberG/src/jabber.cpp b/protocols/JabberG/src/jabber.cpp
index 10e21ebd18..8065b8a0c4 100644
--- a/protocols/JabberG/src/jabber.cpp
+++ b/protocols/JabberG/src/jabber.cpp
@@ -212,8 +212,8 @@ extern "C" int __declspec(dllexport) Load()
 	g_IconsInit();

 	g_XstatusIconsInit();

 	// Init extra icons

-	hExtraActivity = ExtraIcon_Register("activity", LPGEN("Jabber Activity"), "jabber_dancing");

-	hExtraMood = ExtraIcon_Register("mood", LPGEN("Jabber Mood"), "jabber_contemplative");

+	hExtraActivity = ExtraIcon_RegisterIcolib("activity", LPGEN("Jabber Activity"), "jabber_dancing");

+	hExtraMood = ExtraIcon_RegisterIcolib("mood", LPGEN("Jabber Mood"), "jabber_contemplative");

 	g_MenuInit();

 	HookEvent(ME_SYSTEM_MODULESLOADED, OnModulesLoaded);

 	JabberUserInfoInit();

diff --git a/protocols/MRA/src/MraProto.cpp b/protocols/MRA/src/MraProto.cpp
index ffc0918b64..020ebc5c8a 100644
--- a/protocols/MRA/src/MraProto.cpp
+++ b/protocols/MRA/src/MraProto.cpp
@@ -51,8 +51,8 @@ CMraProto::CMraProto(const char* _module, const TCHAR* _displayName) :
 

 	HookProtoEvent(ME_CLIST_PREBUILDSTATUSMENU, &CMraProto::MraRebuildStatusMenu);

 

-	hExtraXstatusIcon = ExtraIcon_Register("MRAXstatus", LPGEN("Mail.ru xStatus"), "mra_xstatus25");

-	hExtraInfo = ExtraIcon_Register("MRAStatus", LPGEN("Mail.ru extra info"), MRA_XSTATUS_UNKNOWN_STR);

+	hExtraXstatusIcon = ExtraIcon_RegisterIcolib("MRAXstatus", LPGEN("Mail.ru xStatus"), "mra_xstatus25");

+	hExtraInfo = ExtraIcon_RegisterIcolib("MRAStatus", LPGEN("Mail.ru extra info"), MRA_XSTATUS_UNKNOWN_STR);

 

 	m_bHideXStatusUI = false;

 	m_iXStatus = getByte(DBSETTING_XSTATUSID, MRA_MIR_XSTATUS_NONE);

diff --git a/protocols/Steam/src/main.cpp b/protocols/Steam/src/main.cpp
index 15436fbe90..204bdd56db 100644
--- a/protocols/Steam/src/main.cpp
+++ b/protocols/Steam/src/main.cpp
@@ -51,18 +51,15 @@ extern "C" int __declspec(dllexport) Load(void)
 

 	// extra statuses

 	HookEvent(ME_SKIN2_ICONSCHANGED, OnReloadIcons);

-	hExtraXStatus = ExtraIcon_Register("steam_game", LPGEN("Steam game"), iconName);

+	hExtraXStatus = ExtraIcon_RegisterIcolib("steam_game", LPGEN("Steam game"), iconName);

 

 	CSteamProto::InitMenus();

-

 	return 0;

 }

 

 extern "C" int __declspec(dllexport) Unload(void)

 {

 	CSteamProto::UninitProtoInstances();

-

 	CSteamProto::UninitMenus();

-

 	return 0;

-}
\ No newline at end of file
+}

diff --git a/protocols/Xfire/src/main.cpp b/protocols/Xfire/src/main.cpp
index 0f237313ce..e77a57a8dd 100644
--- a/protocols/Xfire/src/main.cpp
+++ b/protocols/Xfire/src/main.cpp
@@ -1223,8 +1223,8 @@ extern "C" __declspec(dllexport) int  Load(void)
 

 	Icon_Register(hinstance, LPGEN("Protocols") "/" LPGEN("XFire"), &icon, 1);

 

-	hExtraIcon1 = ExtraIcon_Register("xfire_game", LPGEN("XFire game icon"), "", NULL, ExtraImageApply1);

-	hExtraIcon2 = ExtraIcon_Register("xfire_voice", LPGEN("XFire voice icon"), "", NULL, ExtraImageApply2);

+	hExtraIcon1 = ExtraIcon_RegisterCallack("xfire_game", LPGEN("XFire game icon"), "", NULL, ExtraImageApply1);

+	hExtraIcon2 = ExtraIcon_RegisterCallack("xfire_voice", LPGEN("XFire voice icon"), "", NULL, ExtraImageApply2);

 	return 0;

 }