6 files changed, 15 insertions, 14 deletions
diff --git a/plugins/mRadio/i_myservice.inc b/plugins/mRadio/i_myservice.inc
index 4f50cf573c..e4cf178a5c 100644
--- a/plugins/mRadio/i_myservice.inc
+++ b/plugins/mRadio/i_myservice.inc
@@ -4,7 +4,7 @@ function Service_RadioPlayStop(wParam:WPARAM;lParam:LPARAM):int;cdecl;
 var
   p:PAnsiChar;
   lnew:bool;
-  hContact:THANDLE;
+  hContact:THCONTACT;
   cni:TCONTACTINFO;
   i:integer;
 begin
@@ -145,7 +145,7 @@ end;
 
 //----- Import-export -----
 
-function ImportOneStation(group:PAnsiChar;section:pointer):int;
+function ImportOneStation(group:PAnsiChar;section:pointer):HCONTACT;
 var
   p:pWideChar;
   pc:pAnsiChar;
@@ -218,7 +218,7 @@ begin
   end;
 end;
 
-procedure ExportRadioContact(num:integer;fname:PAnsiChar;hContact:THANDLE);
+procedure ExportRadioContact(num:integer;fname:PAnsiChar;hContact:HCONTACT);
 var
   pc:pAnsiChar;
   section:array [0..15] of AnsiChar;
@@ -257,7 +257,7 @@ end;
 function ExportAll(wParam:WPARAM;lParam:LPARAM):int; cdecl;
 var
   dst:array [0..MAX_PATH-1] of AnsiChar;
-  hContact:THANDLE;
+  hContact:THCONTACT;
 begin
   result:=0;
   if lParam<>0 then
diff --git a/plugins/mRadio/i_search.inc b/plugins/mRadio/i_search.inc
index bcbe6662a7..d585c72d73 100644
--- a/plugins/mRadio/i_search.inc
+++ b/plugins/mRadio/i_search.inc
@@ -276,7 +276,7 @@ end;
 
 function Service_AddToList(wParam:WPARAM;lParam:LPARAM):int_ptr;cdecl;
 var
-  hContact:THANDLE;
+  hContact:THCONTACT;
   p:PWideChar;
   lurl:pWideChar;
 begin
diff --git a/plugins/mRadio/i_service.inc b/plugins/mRadio/i_service.inc
index fbc644711e..e1a528d84f 100644
--- a/plugins/mRadio/i_service.inc
+++ b/plugins/mRadio/i_service.inc
@@ -27,7 +27,7 @@ begin
   result:=0;
 end;
 
-procedure GetAwayMsgProc(hContact:THANDLE); cdecl;
+procedure GetAwayMsgProc(hContact:HCONTACT); cdecl;
 var
   buf,p:PWideChar;
 begin
@@ -131,7 +131,7 @@ begin
   if wParam<>ID_STATUS_OFFLINE then
     wParam:=ID_STATUS_ONLINE;
 
-  if wParam=PluginStatus then
+  if wParam=TWPARAM(PluginStatus) then
     exit;
 
   PluginStatus:=ID_STATUS_OFFLINE;
diff --git a/plugins/mRadio/rccenter.pas b/plugins/mRadio/rccenter.pas
index 6f75ef48ae..ac8c762228 100644
--- a/plugins/mRadio/rccenter.pas
+++ b/plugins/mRadio/rccenter.pas
@@ -4,14 +4,14 @@ unit rccenter;
 interface
 
 uses
-  windows;
+  windows,m_api;
 
 function ControlCenter(code:WPARAM;arg:LPARAM):int_ptr; cdecl;
 
 implementation
 
 uses
-  common, m_api,
+  common,
   dbsettings, playlist, mirutils,
   rglobal, rbass,
   Dynamic_Bass,
diff --git a/plugins/mRadio/rframeapi.pas b/plugins/mRadio/rframeapi.pas
index 0aba02c517..471f8ccf71 100644
--- a/plugins/mRadio/rframeapi.pas
+++ b/plugins/mRadio/rframeapi.pas
@@ -220,7 +220,7 @@ begin
       height  :=tr.bottom-tr.top+2;
       Flags   :=F_VISIBLE or F_NOBORDER or F_UNICODE;
       name.w  :=cPluginName;
-      TBName.w:=cPluginName + ' volume control';
+      TBName.w:=TranslateW(cPluginName + ' volume control');
     end;
 
     FrameId:=CallService(MS_CLIST_FRAMES_ADDFRAME,wparam(@Frame),0);
diff --git a/plugins/mRadio/rglobal.pas b/plugins/mRadio/rglobal.pas
index 283daae17c..d914d4dc21 100644
--- a/plugins/mRadio/rglobal.pas
+++ b/plugins/mRadio/rglobal.pas
@@ -6,6 +6,7 @@ interface
 uses
   windows,
   Dynamic_Bass,
+  m_api,
   playlist;
 
 {$include m_radio.inc}
@@ -20,7 +21,7 @@ const
 
 const
   chan         :HSTREAM = 0;
-  ActiveContact:THANDLE = 0;
+  ActiveContact:HCONTACT = 0;
   ActiveURL    :PWideChar = nil;
 
 const
@@ -158,7 +159,7 @@ const
 
 
 function MakeMessage:pWideChar;
-procedure SetStatus(hContact:THANDLE;status:integer);
+procedure SetStatus(hContact:HCONTACT;status:integer);
 function GetDefaultRecPath:pWideChar;
 function GetStatusText(status:integer;toCList:boolean=false):PWideChar;
 
@@ -166,9 +167,9 @@ function GetStatusText(status:integer;toCList:boolean=false):PWideChar;
 implementation
 
 uses
-  m_api, common, dbsettings;
+  common, dbsettings;
 
-procedure SetStatus(hContact:THANDLE;status:integer);
+procedure SetStatus(hContact:HCONTACT;status:integer);
 begin
 //  if Status=ID_STATUS_OFFLINE then
 //    MyStopBass;