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/KeyboardNotify/src/ignore.cpp | 2 +-
 plugins/KeyboardNotify/src/main.cpp   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'plugins/KeyboardNotify/src')

diff --git a/plugins/KeyboardNotify/src/ignore.cpp b/plugins/KeyboardNotify/src/ignore.cpp
index 878b9a4d8c..b37b664763 100644
--- a/plugins/KeyboardNotify/src/ignore.cpp
+++ b/plugins/KeyboardNotify/src/ignore.cpp
@@ -174,7 +174,7 @@ static void SetAllContactIcons(HWND hwndList)
 	for (auto &hContact : Contacts()) {
 		HANDLE hItem = (HANDLE)SendMessage(hwndList, CLM_FINDCONTACT, hContact, 0);
 		if(hItem && SendMessage(hwndList, CLM_GETEXTRAIMAGE, (WPARAM)hItem, MAKELPARAM(IGNOREEVENT_MAX, 0)) == EMPTY_EXTRA_ICON) {
-			char *szProto = GetContactProto(hContact);
+			char *szProto = Proto_GetBaseAccountName(hContact);
 			if(szProto == nullptr)
 				protoCaps = 0;
 			else
diff --git a/plugins/KeyboardNotify/src/main.cpp b/plugins/KeyboardNotify/src/main.cpp
index df7766cb16..fcbb94a66a 100644
--- a/plugins/KeyboardNotify/src/main.cpp
+++ b/plugins/KeyboardNotify/src/main.cpp
@@ -194,7 +194,7 @@ DBEVENTINFO createMsgEventInfo(MCONTACT hContact)
 {
 	DBEVENTINFO einfo = {};
 	einfo.eventType = EVENTTYPE_MESSAGE;
-	einfo.szModule = GetContactProto(hContact);
+	einfo.szModule = Proto_GetBaseAccountName(hContact);
 	return einfo;
 }
 
@@ -231,7 +231,7 @@ BOOL metaCheckProtocol(const char *szProto, MCONTACT hContact, WORD eventType)
 
 	if (bMetaProtoEnabled && szProto && !mir_strcmp(META_PROTO, szProto))
 		if (hSubContact = db_mc_getMostOnline(hContact))
-			szProto = GetContactProto(hSubContact);
+			szProto = Proto_GetBaseAccountName(hSubContact);
 
 	return checkProtocol(szProto) && checkIgnore(hSubContact ? hSubContact : hContact, eventType);
 }
-- 
cgit v1.2.3