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

1 files changed, 4 insertions, 14 deletions

diff --git a/plugins/Watrack/myshows/myshows.pas b/plugins/Watrack/myshows/myshows.pas
index 0e6ff07da2..5715c530d9 100644
--- a/plugins/Watrack/myshows/myshows.pas
+++ b/plugins/Watrack/myshows/myshows.pas
@@ -27,10 +27,7 @@ type
   end;

 var

   msh_tries,

-//  msh_timeout,

   msh_scrobpos:integer;

-  sic:THANDLE;

-//  slastinf:THANDLE;

   slast:THANDLE;

   MSData:tMyShowsData;

 const

@@ -255,9 +252,6 @@ begin
   result:=0;

 end;

 

-var

-  plStatusHook:THANDLE;

-

 function InitProc(aGetStatus:boolean=false):integer;

 begin

 //  slastinf:=CreateServiceFunction(MS_WAT_MYSHOWSINFO,@SrvMyShowsInfo);

@@ -281,21 +275,17 @@ begin
   slast:=CreateServiceFunction(MS_WAT_MYSHOWS,@SrvMyShows);

   if hMenuMyShows=0 then

     CreateMenus;

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

+  HookEvent(ME_SKIN2_ICONSCHANGED,@IconChanged);

   if (msh_on and 4)=0 then

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

+    HookEvent(ME_WAT_NEWSTATUS,@NewPlStatus);

 end;

 

 procedure DeInitProc(aSetDisable:boolean);

 begin

   if aSetDisable then

-    SetModStatus(0)

-  else

-;//    DestroyServiceFunction(slastinf);

+    SetModStatus(0);

 

   DestroyServiceFunction(slast);

-  UnhookEvent(plStatusHook);

-  UnhookEvent(sic);

 

   if hTimer<>0 then

   begin

@@ -324,7 +314,7 @@ begin
   mmyshows.DeInit    :=@DeInitProc;

   mmyshows.AddOption :=@AddOptionsPage;

   mmyshows.ModuleName:='MyShows.ru';

-  ModuleLink     :=@mmyshows;

+  ModuleLink         :=@mmyshows;

 

 end;