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 /protocols/SkypeWeb | |
| parent | 3216d8df5cb355f34c82ed10b7e40bab7525b697 (diff) | |
GetContactProto: useless duplicate function replaced with standard Proto_GetBaseAccountName
Diffstat (limited to 'protocols/SkypeWeb')
| -rw-r--r-- | protocols/SkypeWeb/src/skype_dialogs.cpp | 2 | ||||
| -rw-r--r-- | protocols/SkypeWeb/src/skype_messages.cpp | 4 | ||||
| -rw-r--r-- | protocols/SkypeWeb/src/skype_trouter.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/protocols/SkypeWeb/src/skype_dialogs.cpp b/protocols/SkypeWeb/src/skype_dialogs.cpp index f692c146b4..d8188e6a87 100644 --- a/protocols/SkypeWeb/src/skype_dialogs.cpp +++ b/protocols/SkypeWeb/src/skype_dialogs.cpp @@ -96,7 +96,7 @@ void CSkypeGCCreateDlg::btnOk_OnOk(CCtrlButton*) void CSkypeGCCreateDlg::FilterList(CCtrlClc *)
{
for (auto &hContact : Contacts()) {
- char *proto = GetContactProto(hContact);
+ char *proto = Proto_GetBaseAccountName(hContact);
if (mir_strcmp(proto, m_proto->m_szModuleName) || m_proto->isChatRoom(hContact))
if (HANDLE hItem = m_clc.FindContact(hContact))
m_clc.DeleteItem(hItem);
diff --git a/protocols/SkypeWeb/src/skype_messages.cpp b/protocols/SkypeWeb/src/skype_messages.cpp index 5a6a7cc5c4..9a1c5ec85e 100644 --- a/protocols/SkypeWeb/src/skype_messages.cpp +++ b/protocols/SkypeWeb/src/skype_messages.cpp @@ -80,7 +80,7 @@ void CSkypeProto::OnMessageSent(const NETLIBHTTPREQUEST *response, void *arg) int CSkypeProto::OnPreCreateMessage(WPARAM, LPARAM lParam)
{
MessageWindowEvent *evt = (MessageWindowEvent*)lParam;
- if (mir_strcmp(GetContactProto(evt->hContact), m_szModuleName))
+ if (mir_strcmp(Proto_GetBaseAccountName(evt->hContact), m_szModuleName))
return 0;
char *message = (char*)evt->dbei->pBlob;
@@ -179,7 +179,7 @@ void CSkypeProto::OnPrivateMessageEvent(const JSONNode &node) int CSkypeProto::OnDbEventRead(WPARAM hContact, LPARAM hDbEvent)
{
- if (IsOnline() && !isChatRoom(hContact) && !mir_strcmp(GetContactProto(hContact), m_szModuleName))
+ if (IsOnline() && !isChatRoom(hContact) && !mir_strcmp(Proto_GetBaseAccountName(hContact), m_szModuleName))
MarkMessagesRead(hContact, hDbEvent);
return 0;
}
diff --git a/protocols/SkypeWeb/src/skype_trouter.cpp b/protocols/SkypeWeb/src/skype_trouter.cpp index eaeec9c62c..c4e28cdfde 100644 --- a/protocols/SkypeWeb/src/skype_trouter.cpp +++ b/protocols/SkypeWeb/src/skype_trouter.cpp @@ -196,7 +196,7 @@ void CSkypeProto::OnTrouterEvent(const JSONNode &body, const JSONNode &) cle.lParam = SKYPE_DB_EVENT_TYPE_INCOMING_CALL;
cle.hIcon = g_plugin.getIcon(IDI_CALL);
- CMStringA service(FORMAT, "%s/IncomingCallCLE", GetContactProto(hContact));
+ CMStringA service(FORMAT, "%s/IncomingCallCLE", Proto_GetBaseAccountName(hContact));
cle.pszService = service.GetBuffer();
CMStringW tooltip(FORMAT, TranslateT("Incoming call from %s"), Clist_GetContactDisplayName(hContact));
|