From ec0e34b4f88ebe03ff12f559e40dda52c51549b7 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Thu, 18 Jun 2015 21:20:39 +0000
Subject: langpack services module destroyed from mir_app the only survived
 service moved to mir_core

git-svn-id: http://svn.miranda-ng.org/main/trunk@14250 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/Utils.pas/mircontacts.pas | 8 ++++----
 plugins/Utils.pas/mirutils.pas    | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'plugins/Utils.pas')

diff --git a/plugins/Utils.pas/mircontacts.pas b/plugins/Utils.pas/mircontacts.pas
index a0b971e008..78c68501ee 100644
--- a/plugins/Utils.pas/mircontacts.pas
+++ b/plugins/Utils.pas/mircontacts.pas
@@ -124,7 +124,7 @@ begin
         AnsiToWide(GetContactID(hContact, Proto), Result);
 
       if (Result = nil) or (Result^ = #0) then
-        AnsiToWide(Translate(Proto), Result, CallService(MS_LANGPACK_GETCODEPAGE, 0, 0));
+        AnsiToWide(Translate(Proto), Result, Langpack_GetDefaultCodePage);
     end;
   end;
 end;
@@ -155,7 +155,7 @@ begin
           DBVT_ASCIIZ: StrDup(Result, dbv.szVal.a);
           DBVT_UTF8,
           DBVT_WCHAR:  begin
-            cp := CallService(MS_LANGPACK_GETCODEPAGE, 0, 0);
+            cp := Langpack_GetDefaultCodePage;
             if dbv._type = DBVT_UTF8 then
               UTF8ToAnsi(dbv.szVal.a, Result, cp)
             else // dbv._type = DBVT_WCHAR then
@@ -174,7 +174,7 @@ begin
   if Proto = nil then
     Proto := GetContactProto(hContact);
   if Proto = nil then
-    Result := CallService(MS_LANGPACK_GETCODEPAGE, 0, 0)
+    Result := Langpack_GetDefaultCodePage
   else
   begin
     Result := DBReadWord(hContact, Proto, 'AnsiCodePage', $FFFF);
@@ -622,7 +622,7 @@ begin
                 DBVT_WORD   : p:=IntToStr(buf1,ldbv.wVal);
                 DBVT_DWORD  : p:=IntToStr(buf1,ldbv.dVal);
                 DBVT_UTF8   : UTF8ToWide(ldbv.szVal.A,p);
-                DBVT_ASCIIZ : AnsiToWide(ldbv.szVal.A,p,CallService(MS_LANGPACK_GETCODEPAGE,0,0));
+                DBVT_ASCIIZ : AnsiToWide(ldbv.szVal.A,p,Langpack_GetDefaultCodePage);
                 DBVT_WCHAR  : p:=ldbv.szVal.W;
                 DBVT_BLOB   : p:='blob';
               end;
diff --git a/plugins/Utils.pas/mirutils.pas b/plugins/Utils.pas/mirutils.pas
index ab7a275a48..16d92a3cec 100644
--- a/plugins/Utils.pas/mirutils.pas
+++ b/plugins/Utils.pas/mirutils.pas
@@ -132,7 +132,7 @@ const
 function MirandaCP:integer;
 begin
   if MirCP<0 then
-    MirCP:=CallService(MS_LANGPACK_GETCODEPAGE,0,0);
+    MirCP:=Langpack_GetDefaultCodePage;
   result:=MirCP;
 end;
 
-- 
cgit v1.2.3