diff options
| author | George Hazan <george.hazan@gmail.com> | 2016-09-11 10:26:49 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2016-09-11 10:26:49 +0000 |
| commit | c77af32ca5d045a672f97bea69d905646bb7de95 (patch) | |
| tree | f36b10096601471d9f66147dd38abe7cc8db7e96 /src/mir_app | |
| parent | fd89f67516b2aa87768e68f710a3cccb416bfb35 (diff) | |
MS_CLIST_EXTRA_ADD_ICON - forgotten EI service
git-svn-id: http://svn.miranda-ng.org/main/trunk@17280 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'src/mir_app')
| -rw-r--r-- | src/mir_app/src/DefaultExtraIcons.cpp | 2 | ||||
| -rw-r--r-- | src/mir_app/src/extraicons.cpp | 11 | ||||
| -rw-r--r-- | src/mir_app/src/extraicons.h | 2 | ||||
| -rw-r--r-- | src/mir_app/src/mir_app.def | 1 | ||||
| -rw-r--r-- | src/mir_app/src/mir_app64.def | 1 | ||||
| -rw-r--r-- | src/mir_app/src/srmm_statusicon.cpp | 4 | ||||
| -rw-r--r-- | src/mir_app/src/usedIcons.cpp | 2 |
7 files changed, 8 insertions, 15 deletions
diff --git a/src/mir_app/src/DefaultExtraIcons.cpp b/src/mir_app/src/DefaultExtraIcons.cpp index 40a38d8397..d7e6ec54cb 100644 --- a/src/mir_app/src/DefaultExtraIcons.cpp +++ b/src/mir_app/src/DefaultExtraIcons.cpp @@ -266,7 +266,7 @@ static ProtoInfo* FindProto(const char *proto) if (hIcon == NULL)
return NULL;
- HANDLE hImage = ExtraIcon_Add(hIcon);
+ HANDLE hImage = ExtraIcon_AddIcon(hIcon);
if (hImage == INVALID_HANDLE_VALUE)
return NULL;
diff --git a/src/mir_app/src/extraicons.cpp b/src/mir_app/src/extraicons.cpp index aae28f5ff2..10a6bb853b 100644 --- a/src/mir_app/src/extraicons.cpp +++ b/src/mir_app/src/extraicons.cpp @@ -278,7 +278,7 @@ HANDLE hEventExtraImageListRebuilding, hEventExtraImageApplying, hEventExtraClic static bool bImageCreated = false;
static HIMAGELIST hExtraImageList;
-HANDLE ExtraIcon_Add(HICON hIcon)
+MIR_APP_DLL(HANDLE) ExtraIcon_AddIcon(HICON hIcon)
{
if (hExtraImageList == 0 || hIcon == 0)
return INVALID_HANDLE_VALUE;
@@ -485,11 +485,6 @@ MIR_APP_DLL(int) ExtraIcon_Clear(HANDLE hExtraIcon, MCONTACT hContact) return extra->setIcon((INT_PTR)hExtraIcon, hContact, NULL);
}
-static INT_PTR svcExtraIcon_Add(WPARAM wParam, LPARAM)
-{
- return (INT_PTR)ExtraIcon_Add((HICON)wParam);
-}
-
///////////////////////////////////////////////////////////////////////////////
static IconItem iconList[] =
@@ -501,9 +496,7 @@ static IconItem iconList[] = void LoadExtraIconsModule()
{
- // Services
- CreateServiceFunction(MS_CLIST_EXTRA_ADD_ICON, svcExtraIcon_Add);
-
+ // Events
hEventExtraClick = CreateHookableEvent(ME_CLIST_EXTRA_CLICK);
hEventExtraImageApplying = CreateHookableEvent(ME_CLIST_EXTRA_IMAGE_APPLY);
hEventExtraImageListRebuilding = CreateHookableEvent(ME_CLIST_EXTRA_LIST_REBUILD);
diff --git a/src/mir_app/src/extraicons.h b/src/mir_app/src/extraicons.h index 285c8372a7..1213654115 100644 --- a/src/mir_app/src/extraicons.h +++ b/src/mir_app/src/extraicons.h @@ -42,8 +42,6 @@ int Clist_SetExtraIcon(MCONTACT hContact, int slot, HANDLE hImage); void DefaultExtraIcons_Load();
-HANDLE ExtraIcon_Add(HICON hIcon);
-
void fnReloadExtraIcons();
void fnSetAllExtraIcons(MCONTACT hContact);
diff --git a/src/mir_app/src/mir_app.def b/src/mir_app/src/mir_app.def index 0a7e79dcec..dfd4856bbf 100644 --- a/src/mir_app/src/mir_app.def +++ b/src/mir_app/src/mir_app.def @@ -279,3 +279,4 @@ Srmm_AddIcon @278 Srmm_GetNthIcon @279
Srmm_ModifyIcon @280
Srmm_RemoveIcon @281
+ExtraIcon_AddIcon @282
diff --git a/src/mir_app/src/mir_app64.def b/src/mir_app/src/mir_app64.def index 76df5da91f..6e1cfb3ff0 100644 --- a/src/mir_app/src/mir_app64.def +++ b/src/mir_app/src/mir_app64.def @@ -279,3 +279,4 @@ Srmm_AddIcon @278 Srmm_GetNthIcon @279
Srmm_ModifyIcon @280
Srmm_RemoveIcon @281
+ExtraIcon_AddIcon @282
diff --git a/src/mir_app/src/srmm_statusicon.cpp b/src/mir_app/src/srmm_statusicon.cpp index 1ca52bb065..eb2ded0671 100644 --- a/src/mir_app/src/srmm_statusicon.cpp +++ b/src/mir_app/src/srmm_statusicon.cpp @@ -78,7 +78,7 @@ static HANDLE hHookIconsChanged; /////////////////////////////////////////////////////////////////////////////////////////
-MIR_APP_DLL(int) Srmm_AddIcon(StatusIconData *sid, int hLangpack)
+MIR_APP_DLL(int) Srmm_AddIcon(StatusIconData *sid, int _hLangpack)
{
if (sid == NULL || sid->cbSize != sizeof(StatusIconData))
return 1;
@@ -89,7 +89,7 @@ MIR_APP_DLL(int) Srmm_AddIcon(StatusIconData *sid, int hLangpack) p = new StatusIconMain;
memcpy(&p->sid, sid, sizeof(p->sid));
- p->hLangpack = hLangpack;
+ p->hLangpack = _hLangpack;
p->sid.szModule = mir_strdup(sid->szModule);
if (sid->flags & MBF_UNICODE)
p->sid.tszTooltip = mir_wstrdup(sid->wszTooltip);
diff --git a/src/mir_app/src/usedIcons.cpp b/src/mir_app/src/usedIcons.cpp index 26890bef4f..6c0b129c90 100644 --- a/src/mir_app/src/usedIcons.cpp +++ b/src/mir_app/src/usedIcons.cpp @@ -55,7 +55,7 @@ static Icon* FindIcon(const char *icolibName) if (icon->hImage == INVALID_HANDLE_VALUE) {
HICON hIcon = IcoLib_GetIcon(icon->name);
if (hIcon != NULL) {
- icon->hImage = ExtraIcon_Add(hIcon);
+ icon->hImage = ExtraIcon_AddIcon(hIcon);
IcoLib_ReleaseIcon(hIcon);
}
}
|