From 680873487c4a7987012606119a744e5ca725ad30 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sat, 13 Apr 2019 20:22:59 +0300 Subject: merge with trunk --- plugins/UserInfoEx/src/svc_gender.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'plugins/UserInfoEx/src/svc_gender.cpp') diff --git a/plugins/UserInfoEx/src/svc_gender.cpp b/plugins/UserInfoEx/src/svc_gender.cpp index bd57c715c5..39a6c19af1 100644 --- a/plugins/UserInfoEx/src/svc_gender.cpp +++ b/plugins/UserInfoEx/src/svc_gender.cpp @@ -72,13 +72,13 @@ BYTE GenderOf(MCONTACT hContact) static int OnCListApplyIcons(MCONTACT hContact, LPARAM) { if (ghExtraIconSvc != INVALID_HANDLE_VALUE) { - char *icoName; + HANDLE hIcon; switch (GenderOf(hContact)) { - case 'M': icoName = ICO_COMMON_MALE; break; - case 'F': icoName = ICO_COMMON_FEMALE; break; - default: icoName = nullptr; + case 'M': hIcon = g_plugin.getIconHandle(IDI_MALE); break; + case 'F': hIcon = g_plugin.getIconHandle(IDI_FEMALE); break; + default: hIcon = nullptr; } - ExtraIcon_SetIconByName(ghExtraIconSvc, hContact, icoName); + ExtraIcon_SetIcon(ghExtraIconSvc, hContact, hIcon); } 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_RegisterIcolib("gender", LPGEN("Gender (UInfoEx)"), ICO_COMMON_MALE); + ghExtraIconSvc = ExtraIcon_RegisterIcolib("gender", LPGEN("Gender (UInfoEx)"), g_plugin.getIconHandle(IDI_MALE)); // hook events if (hChangedHook == nullptr) -- cgit v1.2.3