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

2 files changed, 2 insertions, 9 deletions

diff --git a/plugins/Watrack/kolframe/frm_vars.inc b/plugins/Watrack/kolframe/frm_vars.inc
index 88dd71f0d1..f4d9372002 100644
--- a/plugins/Watrack/kolframe/frm_vars.inc
+++ b/plugins/Watrack/kolframe/frm_vars.inc
@@ -1,8 +1,5 @@
 {Frame variables}

 var

-  sic,

-  PlStatusHook:cardinal;

-

   HiddenByMe:bool;

 

   FrameHeight:dword;

diff --git a/plugins/Watrack/kolframe/kolframe.pas b/plugins/Watrack/kolframe/kolframe.pas
index 615991d810..4e93b6dcc2 100644
--- a/plugins/Watrack/kolframe/kolframe.pas
+++ b/plugins/Watrack/kolframe/kolframe.pas
@@ -223,7 +223,7 @@ begin
     PWATFrameData(FrameCtrl.CustomData).FrameId:=CallService(MS_CLIST_FRAMES_ADDFRAME,dword(@CLFrame),0);

     if PWATFrameData(FrameCtrl.CustomData).FrameId>=0 then

     begin

-      plStatusHook:=HookEvent(ME_WAT_NEWSTATUS,@NewPlStatus);

+      HookEvent(ME_WAT_NEWSTATUS,@NewPlStatus);

     end;

   end;

   result:=FrameWnd<>0;

@@ -235,8 +235,6 @@ var
 begin

   if (FrameCtrl<>nil) and (PWATFrameData(FrameCtrl.CustomData).FrameId>=0) then

   begin

-    UnhookEvent(plStatusHook);

-

     id:=PWATFrameData(FrameCtrl.CustomData).FrameId;

     FrameCtrl.Free;

     FrameCtrl:=nil;

@@ -273,7 +271,7 @@ begin
 

   result:=ord(CreateFrame(0));

   if result<>0 then

-    sic:=HookEvent(ME_SKIN2_ICONSCHANGED,@IconChanged);

+    HookEvent(ME_SKIN2_ICONSCHANGED,@IconChanged);

 end;

 

 procedure DeInitProc(aSetDisable:boolean);

@@ -281,8 +279,6 @@ begin
   if aSetDisable then

     SetModStatus(0);

 

-  if sic<>0 then UnhookEvent(sic);

-  sic:=0;

   DestroyFrame;

 end;