From 6ad65c4d4fce1d5ce1a1873ee84feaff753c9d48 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sun, 10 Mar 2013 19:12:33 +0000 Subject: Watrack: - event hooks wiped out; - icons & menus optimization; - merge of memory leak fix git-svn-id: http://svn.miranda-ng.org/main/trunk@3963 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Watrack/stat/stat_vars.inc | 2 -- plugins/Watrack/stat/statlog.pas | 7 +++---- 2 files changed, 3 insertions(+), 6 deletions(-) (limited to 'plugins/Watrack/stat') diff --git a/plugins/Watrack/stat/stat_vars.inc b/plugins/Watrack/stat/stat_vars.inc index ccc7c0c5b2..d609329c4c 100644 --- a/plugins/Watrack/stat/stat_vars.inc +++ b/plugins/Watrack/stat/stat_vars.inc @@ -16,6 +16,4 @@ var hPackLog, hMakeReport, hAddToLog, - plStatusHook, - sic, hMenuReport:THANDLE; diff --git a/plugins/Watrack/stat/statlog.pas b/plugins/Watrack/stat/statlog.pas index 25ad6f1d6f..4eb275e142 100644 --- a/plugins/Watrack/stat/statlog.pas +++ b/plugins/Watrack/stat/statlog.pas @@ -591,7 +591,7 @@ begin sid.szDescription.a:='Create Report'; Skin_AddIcon(@sid); DestroyIcon(sid.hDefaultIcon); - sic:=HookEvent(ME_SKIN2_ICONSCHANGED,@IconChanged); + HookEvent(ME_SKIN2_ICONSCHANGED,@IconChanged); FillChar(mi, sizeof(mi), 0); mi.cbSize :=sizeof(mi); @@ -602,7 +602,8 @@ begin mi.pszService :=MS_WAT_MAKEREPORT; mi.popupPosition:=MenuReportPos; hMenuReport :=Menu_AddMainMenuItem(@mi); - plStatusHook:=HookEvent(ME_WAT_NEWSTATUS,@NewPlStatus); + + HookEvent(ME_WAT_NEWSTATUS,@NewPlStatus); end; procedure DeInitProc(aSetDisable:boolean); @@ -611,8 +612,6 @@ begin SetModStatus(0); CallService(MS_CLIST_REMOVEMAINMENUITEM,hMenuReport,0); - UnhookEvent(plStatusHook); - UnhookEvent(sic); DestroyServiceFunction(hPackLog); DestroyServiceFunction(hMakeReport); DestroyServiceFunction(hAddToLog); -- cgit v1.2.3