From cee90240b1301ad373e98fe874a924fcdbb83447 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 9 Jul 2012 17:53:15 +0000 Subject: - fix for button states errors in Clist Modern; - fix for message handling duplicates; - fix for naming toolbar icons; - removed duplicate icon entry in dbeditor++ git-svn-id: http://svn.miranda-ng.org/main/trunk@884 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Clist_modern/modern_clistmod.cpp | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) (limited to 'plugins/Clist_modern/modern_clistmod.cpp') diff --git a/plugins/Clist_modern/modern_clistmod.cpp b/plugins/Clist_modern/modern_clistmod.cpp index 2b3b584e11..535ebc3737 100644 --- a/plugins/Clist_modern/modern_clistmod.cpp +++ b/plugins/Clist_modern/modern_clistmod.cpp @@ -54,8 +54,9 @@ int EventsProcessContactDoubleClick(HANDLE hContact); INT_PTR TrayIconPauseAutoHide(WPARAM wParam,LPARAM lParam); INT_PTR ContactChangeGroup(WPARAM wParam,LPARAM lParam); -void InitTrayMenus(void); +void InitTrayMenus(void); +void UninitTrayMenu(); HIMAGELIST hCListImages = NULL; @@ -195,22 +196,20 @@ INT_PTR GetContactIcon(WPARAM wParam,LPARAM lParam) status = ID_STATUS_OFFLINE; else status = db_get_w((HANDLE) wParam, szProto, "Status", ID_STATUS_OFFLINE); - res = ExtIconFromStatusMode((HANDLE)wParam,szProto,szProto == NULL?ID_STATUS_OFFLINE:status); //by FYR - if (lParam == 0 && res != -1) res &= 0xFFFF; - return res; + res = ExtIconFromStatusMode((HANDLE)wParam,szProto,szProto == NULL?ID_STATUS_OFFLINE:status); //by FYR + if (lParam == 0 && res != -1) res &= 0xFFFF; + return res; } -void UninitTrayMenu(); + void UnLoadContactListModule() //unhooks noncritical events { - UninitTrayMenu(); - UninitCustomMenus(); + UninitTrayMenu(); + UninitCustomMenus(); } int CListMod_ContactListShutdownProc(WPARAM wParam,LPARAM lParam) { - FreeDisplayNameCache(); - if (g_hMainThread) CloseHandle(g_hMainThread); - g_hMainThread = NULL; + FreeDisplayNameCache(); return 0; } -- cgit v1.2.3