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/KeyboardNotify/src | |
| parent | 3216d8df5cb355f34c82ed10b7e40bab7525b697 (diff) | |
GetContactProto: useless duplicate function replaced with standard Proto_GetBaseAccountName
Diffstat (limited to 'plugins/KeyboardNotify/src')
| -rw-r--r-- | plugins/KeyboardNotify/src/ignore.cpp | 2 | ||||
| -rw-r--r-- | plugins/KeyboardNotify/src/main.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
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);
}
|