From 59b6fb0fe20c274743fbd1b9742be94b1e5134a4 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Wed, 22 Jul 2015 17:53:20 +0000 Subject: - 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 --- plugins/AuthState/src/main.cpp | 4 ++-- plugins/BuddyExpectator/src/BuddyExpectator.cpp | 6 +++--- plugins/CountryFlags/src/extraimg.cpp | 4 ++-- plugins/FingerprintNG/src/fingerprint.cpp | 2 +- plugins/IgnoreState/src/main.cpp | 8 ++++---- plugins/ListeningTo/src/listeningto.cpp | 5 ++--- plugins/MobileState/src/main.cpp | 5 ++--- plugins/New_GPG/src/icons.cpp | 4 ++-- plugins/New_GPG/src/init.cpp | 3 +-- plugins/Quotes/src/ExtraImages.cpp | 2 +- plugins/Rate/src/main.cpp | 5 ++--- plugins/SecureIM/src/main.cpp | 2 +- plugins/TabSRMM/src/msgdialog.cpp | 2 +- plugins/UserInfoEx/src/Flags/svc_flags.cpp | 2 +- plugins/UserInfoEx/src/svc_email.cpp | 4 ++-- plugins/UserInfoEx/src/svc_gender.cpp | 4 ++-- plugins/UserInfoEx/src/svc_homepage.cpp | 4 ++-- plugins/UserInfoEx/src/svc_phone.cpp | 4 ++-- plugins/UserInfoEx/src/svc_reminder.cpp | 4 ++-- plugins/WhenWasIt/src/icons.cpp | 2 +- 20 files changed, 36 insertions(+), 40 deletions(-) (limited to 'plugins') diff --git a/plugins/AuthState/src/main.cpp b/plugins/AuthState/src/main.cpp index ec7224b259..bf234db17e 100644 --- a/plugins/AuthState/src/main.cpp +++ b/plugins/AuthState/src/main.cpp @@ -103,7 +103,7 @@ int onExtraImageApplying(WPARAM hContact, LPARAM lParam) case icon_auth: icon = "auth_icon"; break; default: icon = NULL; break; } - ExtraIcon_SetIcon(hExtraIcon, (MCONTACT)hContact, icon); + ExtraIcon_SetIconByName(hExtraIcon, (MCONTACT)hContact, icon); return 0; } @@ -209,7 +209,7 @@ extern "C" int __declspec(dllexport) Load(void) Icon_Register(g_hInst, "Auth State", iconList, _countof(iconList)); // extra icons - hExtraIcon = ExtraIcon_Register("authstate", LPGEN("Auth State"), "authgrant_icon"); + hExtraIcon = ExtraIcon_RegisterIcolib("authstate", LPGEN("Auth State"), "authgrant_icon"); return 0; } diff --git a/plugins/BuddyExpectator/src/BuddyExpectator.cpp b/plugins/BuddyExpectator/src/BuddyExpectator.cpp index 3c444dcf0a..ff4a7676a5 100644 --- a/plugins/BuddyExpectator/src/BuddyExpectator.cpp +++ b/plugins/BuddyExpectator/src/BuddyExpectator.cpp @@ -424,7 +424,7 @@ INT_PTR MenuMissYouClick(WPARAM hContact, LPARAM) } else { db_set_b(hContact, MODULE_NAME, "MissYou", 1); - ExtraIcon_SetIcon(hExtraIcon, hContact, "enabled_icon"); + ExtraIcon_SetIconByName(hExtraIcon, hContact, "enabled_icon"); } return 0; @@ -451,7 +451,7 @@ int onPrebuildContactMenu(WPARAM hContact, LPARAM) int onExtraImageApplying(WPARAM hContact, LPARAM) { if (db_get_b(hContact, MODULE_NAME, "MissYou", 0)) - ExtraIcon_SetIcon(hExtraIcon, hContact, "enabled_icon"); + ExtraIcon_SetIconByName(hExtraIcon, hContact, "enabled_icon"); return 0; } @@ -696,7 +696,7 @@ extern "C" int __declspec(dllexport) Load(void) onIconsChanged(0, 0); - hExtraIcon = ExtraIcon_Register("buddy_exp", LPGEN("Buddy Expectator"), "enabled_icon"); + hExtraIcon = ExtraIcon_RegisterIcolib("buddy_exp", LPGEN("Buddy Expectator"), "enabled_icon"); return 0; } diff --git a/plugins/CountryFlags/src/extraimg.cpp b/plugins/CountryFlags/src/extraimg.cpp index 5f887b2745..491d413742 100644 --- a/plugins/CountryFlags/src/extraimg.cpp +++ b/plugins/CountryFlags/src/extraimg.cpp @@ -56,7 +56,7 @@ static void CALLBACK SetExtraImage(MCONTACT hContact) else { char szId[20]; mir_snprintf(szId, _countof(szId), (countryNumber == 0xFFFF) ? "%s0x%X" : "%s%i", "flags_", countryNumber); - ExtraIcon_SetIcon(hExtraIcon, hContact, szId); + ExtraIcon_SetIconByName(hExtraIcon, hContact, szId); } } @@ -200,7 +200,7 @@ void InitExtraImg(void) HookEvent(ME_DB_CONTACT_SETTINGCHANGED, ExtraImgSettingChanged); /* Extra Image */ - hExtraIcon = ExtraIcon_Register("flags_extra", LPGEN("Country flag"), "flags_0"); + hExtraIcon = ExtraIcon_RegisterIcolib("flags_extra", LPGEN("Country flag"), "flags_0"); if (bShowExtraIcon) EnsureExtraImages(); } diff --git a/plugins/FingerprintNG/src/fingerprint.cpp b/plugins/FingerprintNG/src/fingerprint.cpp index 096c9ff9ba..7b59cc0749 100644 --- a/plugins/FingerprintNG/src/fingerprint.cpp +++ b/plugins/FingerprintNG/src/fingerprint.cpp @@ -971,6 +971,6 @@ void InitFingerModule() CreateServiceFunction(MS_FP_GETCLIENTDESCRW, ServiceGetClientDescrW); CreateServiceFunction(MS_FP_GETCLIENTICONW, ServiceGetClientIconW); - hExtraIcon = ExtraIcon_Register("Client", LPGEN("Fingerprint"), "client_Miranda_unknown", + hExtraIcon = ExtraIcon_RegisterCallack("Client", LPGEN("Fingerprint"), "client_Miranda_unknown", OnExtraIconListRebuild, OnExtraImageApply, OnExtraIconClick); } diff --git a/plugins/IgnoreState/src/main.cpp b/plugins/IgnoreState/src/main.cpp index ad8083d2d4..353efadb94 100644 --- a/plugins/IgnoreState/src/main.cpp +++ b/plugins/IgnoreState/src/main.cpp @@ -97,13 +97,13 @@ void applyExtraImage(MCONTACT hContact) { int ignore = isIgnored(hContact, IGNOREEVENT_ALL); if (ignore == 1) - ExtraIcon_SetIcon(hExtraIcon, hContact, "ignore_full"); + ExtraIcon_SetIconByName(hExtraIcon, hContact, "ignore_full"); else if (ignore == 0) ExtraIcon_Clear(hExtraIcon, hContact); else if (isIgnored(hContact, IGNOREEVENT_MESSAGE)) - ExtraIcon_SetIcon(hExtraIcon, hContact, "ignore_mess"); + ExtraIcon_SetIconByName(hExtraIcon, hContact, "ignore_mess"); else - ExtraIcon_SetIcon(hExtraIcon, hContact, "ignore_part"); + ExtraIcon_SetIconByName(hExtraIcon, hContact, "ignore_part"); } ///////////////////////////////////////////////////////////////////////////////////////// @@ -169,7 +169,7 @@ extern "C" int __declspec(dllexport) Load(void) //IcoLib support Icon_Register(g_hInst, LPGEN("Ignore State"), iconList, _countof(iconList)); - hExtraIcon = ExtraIcon_Register("ignore", LPGEN("Ignore State"), "ignore_full"); + hExtraIcon = ExtraIcon_RegisterIcolib("ignore", LPGEN("Ignore State"), "ignore_full"); return 0; } diff --git a/plugins/ListeningTo/src/listeningto.cpp b/plugins/ListeningTo/src/listeningto.cpp index 22a5663a82..c1472b79cb 100644 --- a/plugins/ListeningTo/src/listeningto.cpp +++ b/plugins/ListeningTo/src/listeningto.cpp @@ -145,8 +145,7 @@ extern "C" int __declspec(dllexport) Load(void) Icon_Register(hInst, LPGEN("ListeningTo"), iconList, _countof(iconList)); // Extra icon support - hExtraIcon = ExtraIcon_Register(MODULE_NAME "_icon", LPGEN("Listening to music"), "listening_to_icon"); - + hExtraIcon = ExtraIcon_RegisterIcolib(MODULE_NAME "_icon", LPGEN("Listening to music"), "listening_to_icon"); return 0; } @@ -911,7 +910,7 @@ void HasNewListeningInfo() void SetExtraIcon(MCONTACT hContact, BOOL set) { - ExtraIcon_SetIcon(hExtraIcon, hContact, set ? "listening_to_icon" : NULL); + ExtraIcon_SetIconByName(hExtraIcon, hContact, set ? "listening_to_icon" : NULL); } int SettingChanged(WPARAM hContact,LPARAM lParam) diff --git a/plugins/MobileState/src/main.cpp b/plugins/MobileState/src/main.cpp index 256e727e6b..e39187cad1 100644 --- a/plugins/MobileState/src/main.cpp +++ b/plugins/MobileState/src/main.cpp @@ -74,7 +74,7 @@ int ExtraIconsApply(WPARAM wParam, LPARAM lParam) return 0; if (hasMobileClient(wParam, lParam)) - ExtraIcon_SetIcon(hExtraIcon, wParam, "mobile_icon"); + ExtraIcon_SetIconByName(hExtraIcon, wParam, "mobile_icon"); else ExtraIcon_Clear(hExtraIcon, wParam); @@ -115,8 +115,7 @@ extern "C" int __declspec(dllexport) Load(void) Icon_Register(g_hInst, "Mobile State", &icon, 1); // Extra icons - hExtraIcon = ExtraIcon_Register("mobilestate", LPGEN("Mobile State"), "mobile_icon"); - + hExtraIcon = ExtraIcon_RegisterIcolib("mobilestate", LPGEN("Mobile State"), "mobile_icon"); return 0; } diff --git a/plugins/New_GPG/src/icons.cpp b/plugins/New_GPG/src/icons.cpp index d5206f3858..6d89633710 100644 --- a/plugins/New_GPG/src/icons.cpp +++ b/plugins/New_GPG/src/icons.cpp @@ -40,9 +40,9 @@ void setClistIcon(MCONTACT hContact) extern HANDLE g_hCLIcon; MCONTACT hMC = db_mc_tryMeta(hContact); const char *szIconId = (enabled) ? "secured" : NULL; - ExtraIcon_SetIcon(g_hCLIcon, hContact, szIconId); + ExtraIcon_SetIconByName(g_hCLIcon, hContact, szIconId); if(hMC != hContact) - ExtraIcon_SetIcon(g_hCLIcon, hMC, szIconId); + ExtraIcon_SetIconByName(g_hCLIcon, hMC, szIconId); } void setSrmmIcon(MCONTACT h) diff --git a/plugins/New_GPG/src/init.cpp b/plugins/New_GPG/src/init.cpp index 47f7733ec3..56b307e177 100644 --- a/plugins/New_GPG/src/init.cpp +++ b/plugins/New_GPG/src/init.cpp @@ -214,8 +214,7 @@ extern "C" int __declspec(dllexport) Load() InitIconLib(); - g_hCLIcon = ExtraIcon_Register(szGPGModuleName, Translate("GPG encryption status"), "secured", onExtraImageListRebuilding, onExtraImageApplying); - + g_hCLIcon = ExtraIcon_RegisterCallack(szGPGModuleName, Translate("GPG encryption status"), "secured", onExtraImageListRebuilding, onExtraImageApplying); return 0; } diff --git a/plugins/Quotes/src/ExtraImages.cpp b/plugins/Quotes/src/ExtraImages.cpp index 1f346f81f6..dd823bfcc2 100644 --- a/plugins/Quotes/src/ExtraImages.cpp +++ b/plugins/Quotes/src/ExtraImages.cpp @@ -4,7 +4,7 @@ static HANDLE hExtraIcon; void Quotes_InitExtraIcons() { - hExtraIcon = ExtraIcon_Register(ICON_STR_QUOTE, QUOTES_PROTOCOL_NAME, Quotes_MakeIconName(ICON_STR_MAIN).c_str()); + hExtraIcon = ExtraIcon_RegisterIcolib(ICON_STR_QUOTE, QUOTES_PROTOCOL_NAME, Quotes_MakeIconName(ICON_STR_MAIN).c_str()); } bool SetContactExtraImage(MCONTACT hContact, EImageIndex nIndex) diff --git a/plugins/Rate/src/main.cpp b/plugins/Rate/src/main.cpp index b7f234572b..7677f10aa5 100644 --- a/plugins/Rate/src/main.cpp +++ b/plugins/Rate/src/main.cpp @@ -85,7 +85,7 @@ static void setExtraIcon(MCONTACT hContact, int bRate = -1, BOOL clear = TRUE) } if (icon != NULL || clear) - ExtraIcon_SetIcon(hExtraIcon, hContact, icon); + ExtraIcon_SetIconByName(hExtraIcon, hContact, icon); } /////////////////////////////////////////////////////////////////////////////// @@ -127,8 +127,7 @@ extern "C" int __declspec(dllexport) Load(void) Icon_Register(g_hInst, LPGEN("Contact rate"), iconList, _countof(iconList)); // Extra icon support - hExtraIcon = ExtraIcon_Register("contact_rate", LPGEN("Contact rate"), "rate_high"); - + hExtraIcon = ExtraIcon_RegisterIcolib("contact_rate", LPGEN("Contact rate"), "rate_high"); return 0; } diff --git a/plugins/SecureIM/src/main.cpp b/plugins/SecureIM/src/main.cpp index e5fcdd8439..bfbfa8f566 100644 --- a/plugins/SecureIM/src/main.cpp +++ b/plugins/SecureIM/src/main.cpp @@ -357,7 +357,7 @@ extern "C" __declspec(dllexport) int __cdecl Load(void) CreateServiceFunction(MODULENAME"/MODE_GPG", Service_ModeGPG); CreateServiceFunction(MODULENAME"/MODE_RSA", Service_ModeRSAAES); - g_hCLIcon = ExtraIcon_Register(MODULENAME, LPGEN("SecureIM status"), "sim_cm_est", onExtraImageListRebuilding, onExtraImageApplying); + g_hCLIcon = ExtraIcon_RegisterCallack(MODULENAME, LPGEN("SecureIM status"), "sim_cm_est", onExtraImageListRebuilding, onExtraImageApplying); return 0; } diff --git a/plugins/TabSRMM/src/msgdialog.cpp b/plugins/TabSRMM/src/msgdialog.cpp index 452252e78d..57fa1319d6 100644 --- a/plugins/TabSRMM/src/msgdialog.cpp +++ b/plugins/TabSRMM/src/msgdialog.cpp @@ -2037,7 +2037,7 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP break; case IDM_OPENEXISTING: - Utils_OpenUrlT(tszUrl,false); + Utils_OpenUrlT(tszUrl, false); break; case IDM_COPYLINK: 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); } diff --git a/plugins/WhenWasIt/src/icons.cpp b/plugins/WhenWasIt/src/icons.cpp index 624992a49f..98760e03c6 100644 --- a/plugins/WhenWasIt/src/icons.cpp +++ b/plugins/WhenWasIt/src/icons.cpp @@ -66,7 +66,7 @@ int AddIcons() mir_snprintf(description, _countof(description), Translate("More than %d days to birthday"), cDTB - 1); hDTBMore = AddIcon("DTBMore", description, tszPath, IDI_DTBMORE); - hWWIExtraIcons = ExtraIcon_Register("WhenWasIt", LPGEN("WhenWasIt birthday reminder"), "MenuCheck"); + hWWIExtraIcons = ExtraIcon_RegisterIcolib("WhenWasIt", LPGEN("WhenWasIt birthday reminder"), "MenuCheck"); return 0; } -- cgit v1.2.3