From 777dc2174f34c2a4d4499c3d63ef8914ed9ecb81 Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Wed, 7 Mar 2018 23:38:31 +0300
Subject: old AdvaImg services converted into Image_* functions

---
 plugins/Watrack/popup/pop_vars.inc | 1 -
 plugins/Watrack/popup/popups.pas   | 9 ++-------
 2 files changed, 2 insertions(+), 8 deletions(-)

(limited to 'plugins/Watrack')

diff --git a/plugins/Watrack/popup/pop_vars.inc b/plugins/Watrack/popup/pop_vars.inc
index 61e7edb9f7..4c192af720 100644
--- a/plugins/Watrack/popup/pop_vars.inc
+++ b/plugins/Watrack/popup/pop_vars.inc
@@ -16,7 +16,6 @@ var
 
   DisablePlugin:integer;
   IsPopup2Present:boolean;
-  IsFreeImagePresent:boolean;
 var
   hMenuInfo   :THANDLE;
   ssmi,
diff --git a/plugins/Watrack/popup/popups.pas b/plugins/Watrack/popup/popups.pas
index 8e7782de69..f7b4b98da5 100644
--- a/plugins/Watrack/popup/popups.pas
+++ b/plugins/Watrack/popup/popups.pas
@@ -212,10 +212,7 @@ begin
 
         if si.cover<>nil then
         begin
-          if IsFreeImagePresent then
-            hbmAvatar:=CallService(MS_IMG_LOAD,wparam(si.cover),IMGL_WCHAR)
-          else
-            hbmAvatar:=0;
+          hbmAvatar:=Image_Load(si.cover, IMGL_WCHAR);
           if hbmAvatar=0 then
           begin
             hbmAvatar:=CallService(MS_UTILS_LOADBITMAPW,0,lparam(si.cover));
@@ -397,7 +394,6 @@ begin
   PopupPresent:=newstate;
   if PopupPresent then
   begin
-    IsFreeImagePresent:=ServiceExists(MS_IMG_LOAD);
     IsPopup2Present   :=ServiceExists(MS_POPUP_ADDPOPUP2);
     opthook:=HookEvent(ME_OPT_INITIALISE,@OnOptInitialise);
 
@@ -481,8 +477,7 @@ begin
   ActionList:=nil;
   if ServiceExists(MS_POPUP_ADDPOPUPW) then
   begin
-    IsFreeImagePresent:=ServiceExists(MS_IMG_LOAD);
-    IsPopup2Present   :=ServiceExists(MS_POPUP_ADDPOPUP2);
+    IsPopup2Present := ServiceExists(MS_POPUP_ADDPOPUP2);
     PopupPresent:=true;
     opthook:=HookEvent(ME_OPT_INITIALISE,@OnOptInitialise);
     loadpopup;
-- 
cgit v1.2.3