diff options
| author | George Hazan <ghazan@miranda.im> | 2019-12-04 16:08:03 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2019-12-04 16:08:03 +0300 |
| commit | 3bb16e798cb51d5764aacbefd4edf26f52d8c4f0 (patch) | |
| tree | 59dbb53fc9496d660ec2ef2846a4eab0f1720b88 /plugins/HistoryPlusPlus | |
| parent | 3216d8df5cb355f34c82ed10b7e40bab7525b697 (diff) | |
GetContactProto: useless duplicate function replaced with standard Proto_GetBaseAccountName
Diffstat (limited to 'plugins/HistoryPlusPlus')
| -rw-r--r-- | plugins/HistoryPlusPlus/GlobalSearch.pas | 2 | ||||
| -rw-r--r-- | plugins/HistoryPlusPlus/historypp.dpr | 2 | ||||
| -rw-r--r-- | plugins/HistoryPlusPlus/hpp_contacts.pas | 6 |
3 files changed, 5 insertions, 5 deletions
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
|