From 3bb16e798cb51d5764aacbefd4edf26f52d8c4f0 Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Wed, 4 Dec 2019 16:08:03 +0300
Subject: GetContactProto: useless duplicate function replaced with standard
 Proto_GetBaseAccountName

---
 plugins/HistoryPlusPlus/GlobalSearch.pas | 2 +-
 plugins/HistoryPlusPlus/historypp.dpr    | 2 +-
 plugins/HistoryPlusPlus/hpp_contacts.pas | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'plugins/HistoryPlusPlus')

diff --git a/plugins/HistoryPlusPlus/GlobalSearch.pas b/plugins/HistoryPlusPlus/GlobalSearch.pas
index 05952b571e..6cd4e103eb 100644
--- a/plugins/HistoryPlusPlus/GlobalSearch.pas
+++ b/plugins/HistoryPlusPlus/GlobalSearch.pas
@@ -576,7 +576,7 @@ begin
   if CurContact = 0 then
     CurProto := 'ICQ'
   else
-    CurProto := GetContactProto(CurContact);
+    CurProto := Proto_GetBaseAccountName(CurContact);
   laProgress.Caption := Format(TranslateW('Searching "%s"...'),
     [GetContactDisplayName(CurContact, CurProto, True)]);
 end;
diff --git a/plugins/HistoryPlusPlus/historypp.dpr b/plugins/HistoryPlusPlus/historypp.dpr
index 71841fb8bf..62dc2d019d 100644
--- a/plugins/HistoryPlusPlus/historypp.dpr
+++ b/plugins/HistoryPlusPlus/historypp.dpr
@@ -347,7 +347,7 @@ begin
     exit;
   end;
 
-  szProto := Proto_GetProtoName(wParam);
+  szProto := Proto_GetBaseAccountName(wParam);
   if (StrComp(cws.szModule, 'CList') <> 0) and
     ((szProto = nil) or (StrComp(cws.szModule, szProto) <> 0)) then
     exit;
diff --git a/plugins/HistoryPlusPlus/hpp_contacts.pas b/plugins/HistoryPlusPlus/hpp_contacts.pas
index d82eff0d83..b66db1d2f2 100644
--- a/plugins/HistoryPlusPlus/hpp_contacts.pas
+++ b/plugins/HistoryPlusPlus/hpp_contacts.pas
@@ -68,16 +68,16 @@ uses hpp_database, hpp_options;
 
 function GetContactProto(hContact: TMCONTACT): AnsiString;
 begin
-  Result := Proto_GetProtoName(hContact);
+  Result := Proto_GetBaseAccountName(hContact);
 end;
 
 function GetContactProto(hContact: TMCONTACT; var SubContact: TMCONTACT; var SubProtocol: AnsiString): AnsiString;
 begin
-  Result := Proto_GetProtoName(hContact);
+  Result := Proto_GetBaseAccountName(hContact);
   if (Result = META_PROTO) then
   begin
     SubContact := db_mc_getMostOnline(hContact);
-    SubProtocol := Proto_GetProtoName(SubContact);
+    SubProtocol := Proto_GetBaseAccountName(SubContact);
   end
   else
   begin
-- 
cgit v1.2.3