- 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, 11 deletions

diff --git a/plugins/UserInfoEx/src/Flags/svc_flags.cpp b/plugins/UserInfoEx/src/Flags/svc_flags.cpp
index e8cd5ab68b..33d0ccf619 100644
--- a/plugins/UserInfoEx/src/Flags/svc_flags.cpp
+++ b/plugins/UserInfoEx/src/Flags/svc_flags.cpp
@@ -221,7 +221,7 @@ void SvcFlagsLoadModule()
 

 	char szId[20];

 	mir_snprintf(szId, _countof(szId), (langid == 0xFFFF) ? "%s_0x%X" : "%s_%i", "flags", langid); /* buffer safe */

-	hExtraIconSvc = ExtraIcon_Register("Flags", LPGEN("Flags (uinfoex)"), szId);

+	hExtraIconSvc = ExtraIcon_RegisterIcolib("Flags", LPGEN("Flags (uinfoex)"), szId);

 }

 

 /**

diff --git a/plugins/UserInfoEx/src/svc_email.cpp b/plugins/UserInfoEx/src/svc_email.cpp
index 3a8128cc62..825416ad0e 100644
--- a/plugins/UserInfoEx/src/svc_email.cpp
+++ b/plugins/UserInfoEx/src/svc_email.cpp
@@ -127,7 +127,7 @@ static INT_PTR MenuCommand(WPARAM wParam,LPARAM lParam)
 static int OnCListApplyIcons(WPARAM wParam, LPARAM lParam)

 {

 	LPSTR val = Get(wParam);

-	ExtraIcon_SetIcon(ghExtraIconSvc, wParam, (val) ? ICO_BTN_EMAIL : 0);

+	ExtraIcon_SetIconByName(ghExtraIconSvc, wParam, (val) ? ICO_BTN_EMAIL : 0);

 	mir_free(val);

 	return 0;

 }

@@ -228,7 +228,7 @@ bool SvcEMailEnableExtraIcons(bool bEnable, bool bUpdateDB)
 			hApplyIconHook = HookEvent(ME_CLIST_EXTRA_IMAGE_APPLY, OnCListApplyIcons);

 

 		if (ghExtraIconSvc == INVALID_HANDLE_VALUE)

-			ghExtraIconSvc = ExtraIcon_Register("email", LPGEN("E-mail (uinfoex)"), ICO_BTN_EMAIL);

+			ghExtraIconSvc = ExtraIcon_RegisterIcolib("email", LPGEN("E-mail (uinfoex)"), ICO_BTN_EMAIL);

 	}

 	else { // E-mail uncheckt

 		if (hChangedHook) {

diff --git a/plugins/UserInfoEx/src/svc_gender.cpp b/plugins/UserInfoEx/src/svc_gender.cpp
index 71f0f5eee5..409dca888c 100644
--- a/plugins/UserInfoEx/src/svc_gender.cpp
+++ b/plugins/UserInfoEx/src/svc_gender.cpp
@@ -78,7 +78,7 @@ static int OnCListApplyIcons(MCONTACT hContact, LPARAM)
 			case 'F':  icoName = ICO_COMMON_FEMALE; break;

 			default:   icoName = NULL;

 		}

-		ExtraIcon_SetIcon(ghExtraIconSvc, hContact, icoName);

+		ExtraIcon_SetIconByName(ghExtraIconSvc, hContact, icoName);

 	}

 	return 0;

 }

@@ -117,7 +117,7 @@ bool SvcGenderEnableExtraIcons(bool bEnable, bool bUpdateDB)
 

 	if (g_eiGender) { // Gender checked or dropdown select

 		if (ghExtraIconSvc == INVALID_HANDLE_VALUE)

-			ghExtraIconSvc = ExtraIcon_Register("gender", LPGEN("Gender (uinfoex)"), ICO_COMMON_MALE);

+			ghExtraIconSvc = ExtraIcon_RegisterIcolib("gender", LPGEN("Gender (uinfoex)"), ICO_COMMON_MALE);

 

 		// hook events

 		if (hChangedHook == NULL) 

diff --git a/plugins/UserInfoEx/src/svc_homepage.cpp b/plugins/UserInfoEx/src/svc_homepage.cpp
index 609eff8649..773846657e 100644
--- a/plugins/UserInfoEx/src/svc_homepage.cpp
+++ b/plugins/UserInfoEx/src/svc_homepage.cpp
@@ -93,7 +93,7 @@ static int OnCListApplyIcons(MCONTACT hContact, LPARAM)
 {

 	LPSTR val = Get(hContact);

 	if (ghExtraIconSvc != INVALID_HANDLE_VALUE)

-		ExtraIcon_SetIcon(ghExtraIconSvc, hContact, (val) ? ICO_BTN_GOTO : NULL);

+		ExtraIcon_SetIconByName(ghExtraIconSvc, hContact, (val) ? ICO_BTN_GOTO : NULL);

 	MIR_FREE(val);

 	return 0;

 }

@@ -188,7 +188,7 @@ bool SvcHomepageEnableExtraIcons(bool bEnable, bool bUpdateDB)
 			hApplyIconHook = HookEvent(ME_CLIST_EXTRA_IMAGE_APPLY, (MIRANDAHOOK)OnCListApplyIcons);

 

 		if (ghExtraIconSvc == INVALID_HANDLE_VALUE)

-			ghExtraIconSvc = ExtraIcon_Register("homepage", LPGEN("Homepage (uinfoex)"), ICO_BTN_GOTO);

+			ghExtraIconSvc = ExtraIcon_RegisterIcolib("homepage", LPGEN("Homepage (uinfoex)"), ICO_BTN_GOTO);

 	}

 	else {

 		if (hChangedHook) {

diff --git a/plugins/UserInfoEx/src/svc_phone.cpp b/plugins/UserInfoEx/src/svc_phone.cpp
index d236757f2c..9246ff87a0 100644
--- a/plugins/UserInfoEx/src/svc_phone.cpp
+++ b/plugins/UserInfoEx/src/svc_phone.cpp
@@ -94,7 +94,7 @@ static int OnCListApplyIcons(MCONTACT hContact, LPARAM)
 		case PHONE_SMS:     icoName = ICO_BTN_CELLULAR;  break;

 		default:            icoName = NULL;

 	}

-	ExtraIcon_SetIcon(ghExtraIconSvc, hContact, icoName);

+	ExtraIcon_SetIconByName(ghExtraIconSvc, hContact, icoName);

 	return 0;

 }

 

@@ -146,7 +146,7 @@ bool SvcPhoneEnableExtraIcons(bool bEnable, bool bUpdateDB)
 			hApplyIconHook = HookEvent(ME_CLIST_EXTRA_IMAGE_APPLY, (MIRANDAHOOK)OnCListApplyIcons);

 

 		if (ghExtraIconSvc == INVALID_HANDLE_VALUE)

-			ghExtraIconSvc = ExtraIcon_Register("sms", LPGEN("Phone (uinfoex)"), ICO_BTN_CELLULAR);

+			ghExtraIconSvc = ExtraIcon_RegisterIcolib("sms", LPGEN("Phone (uinfoex)"), ICO_BTN_CELLULAR);

 	}

 	else {

 		if (hChangedHook) {

diff --git a/plugins/UserInfoEx/src/svc_reminder.cpp b/plugins/UserInfoEx/src/svc_reminder.cpp
index 6d84a26dad..aacdf1e6c1 100644
--- a/plugins/UserInfoEx/src/svc_reminder.cpp
+++ b/plugins/UserInfoEx/src/svc_reminder.cpp
@@ -200,7 +200,7 @@ static void NotifyWithExtraIcon(MCONTACT hContact, const CEvent &evt)
 		default:	

 			return;

 		}

-		ExtraIcon_SetIcon(ExtraIcon, hContact, icoName);

+		ExtraIcon_SetIconByName(ExtraIcon, hContact, icoName);

 	}

 }

 

@@ -928,7 +928,7 @@ void SvcReminderLoadModule(void)
 	Hotkey_Register(&hk);

 

 	if (db_get_b(NULL, MODNAME, SET_REMIND_ENABLED, DEFVAL_REMIND_ENABLED) != REMIND_OFF && ExtraIcon == INVALID_HANDLE_VALUE)

-		ExtraIcon = ExtraIcon_Register("Reminder", LPGEN("Reminder (uinfoex)"), ICO_COMMON_ANNIVERSARY);

+		ExtraIcon = ExtraIcon_RegisterIcolib("Reminder", LPGEN("Reminder (uinfoex)"), ICO_COMMON_ANNIVERSARY);

 

 }