diff options
| author | George Hazan <george.hazan@gmail.com> | 2012-11-03 20:16:42 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2012-11-03 20:16:42 +0000 |
| commit | f12d8b56f2894e94491bd7424d69f595d285f01f (patch) | |
| tree | 3f54d66c8c248bb456da1cb0c5cc31661f144e5f /plugins/UserInfoEx/src/Flags | |
| parent | 1b1a54dc156bec90be3ddc337c17b4e67179d4ea (diff) | |
no more MS_CLIST_EXTRA_ADD_ICON in the application code
git-svn-id: http://svn.miranda-ng.org/main/trunk@2175 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/UserInfoEx/src/Flags')
| -rw-r--r-- | plugins/UserInfoEx/src/Flags/svc_flags.cpp | 4 | ||||
| -rw-r--r-- | plugins/UserInfoEx/src/Flags/svc_flags.h | 9 |
2 files changed, 5 insertions, 8 deletions
diff --git a/plugins/UserInfoEx/src/Flags/svc_flags.cpp b/plugins/UserInfoEx/src/Flags/svc_flags.cpp index 359d574b30..ed43e04161 100644 --- a/plugins/UserInfoEx/src/Flags/svc_flags.cpp +++ b/plugins/UserInfoEx/src/Flags/svc_flags.cpp @@ -43,7 +43,6 @@ FLAGSOPTIONS gFlagsOpts; /* Misc */
int nCountriesCount;
struct CountryListEntry *countries;
-static HANDLE *phExtraImageList = NULL; //return value(s) from MS_CLIST_EXTRA_ADD_ICON
static HANDLE hExtraIconSvc = INVALID_HANDLE_VALUE;
/* hook */
static HANDLE hRebuildIconsHook = NULL;
@@ -344,7 +343,7 @@ VOID SvcFlagsEnableExtraIcons(BYTE bColumn, BOOLEAN bUpdateDB) mir_snprintf(szId, SIZEOF(szId), (langid==0xFFFF)?"%s_0x%X":"%s_%i","flags",langid); /* buffer safe */
ico.descIcon = szId;
hExtraIconSvc = (HANDLE)CallService(MS_EXTRAICON_REGISTER, (WPARAM)&ico, 0);
- if(hExtraIconSvc)
+ if (hExtraIconSvc)
HookEvent(ME_DB_CONTACT_SETTINGCHANGED, OnExtraIconSvcChanged);
}
@@ -620,7 +619,6 @@ void SvcFlagsUnloadModule() { UnhookEvent(hRebuildIconsHook);
UnhookEvent(hApplyIconHook);
UnhookEvent(hIconsChangedHook);
- mir_free(phExtraImageList); /* does NULL check */
//Uninit message winsow
UnhookEvent(hMsgWndEventHook);
for(int i = 0; i < gMsgWndList.getCount(); i++) {
diff --git a/plugins/UserInfoEx/src/Flags/svc_flags.h b/plugins/UserInfoEx/src/Flags/svc_flags.h index e7f97ab963..a597f67e8a 100644 --- a/plugins/UserInfoEx/src/Flags/svc_flags.h +++ b/plugins/UserInfoEx/src/Flags/svc_flags.h @@ -70,11 +70,10 @@ class MsgWndData { class IconList {
public:
- int m_ID;
- HANDLE m_hIcon; //register
- HANDLE m_hImage; //return value from MS_CLIST_EXTRA_ADD_ICON -INVALID_HANDLE_VALUE; //preset
- BYTE m_TypeFlag;
- StatusIconData m_StatusIconData;
+ int m_ID;
+ HANDLE m_hIcon; //register
+ BYTE m_TypeFlag;
+ StatusIconData m_StatusIconData;
IconList(StatusIconData* sid);
// IconList(HWND hwnd, HANDLE hContact);
|