diff options
| author | George Hazan <ghazan@miranda.im> | 2018-04-05 22:10:25 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2018-04-05 22:10:25 +0300 |
| commit | 35e2289786a7f1542573d1a58ebc971970ea981c (patch) | |
| tree | da8887c793611fdbf6072fd477fd8c01c60b8b02 /protocols/SkypeWeb | |
| parent | f7c00d6dc53774d16b9721e79ed5d4017af63884 (diff) | |
CLIST_INTERFACE::pfnGetContactDisplayName => Clist_GetContactDisplayName
Diffstat (limited to 'protocols/SkypeWeb')
| -rw-r--r-- | protocols/SkypeWeb/src/skype_dialogs.cpp | 10 | ||||
| -rw-r--r-- | protocols/SkypeWeb/src/skype_trouter.cpp | 4 |
2 files changed, 6 insertions, 8 deletions
diff --git a/protocols/SkypeWeb/src/skype_dialogs.cpp b/protocols/SkypeWeb/src/skype_dialogs.cpp index 1147810864..a10eaafb62 100644 --- a/protocols/SkypeWeb/src/skype_dialogs.cpp +++ b/protocols/SkypeWeb/src/skype_dialogs.cpp @@ -39,13 +39,11 @@ CSkypeInviteDlg::CSkypeInviteDlg(CSkypeProto *proto) : void CSkypeInviteDlg::OnInitDialog()
{
- for (auto &hContact : m_proto->AccContacts()) {
- if (!m_proto->isChatRoom(hContact)) {
- wchar_t *ptszNick = pcli->pfnGetContactDisplayName(hContact, 0);
- m_combo.AddString(ptszNick, hContact);
- }
- }
+ for (auto &hContact : m_proto->AccContacts())
+ if (!m_proto->isChatRoom(hContact))
+ m_combo.AddString(Clist_GetContactDisplayName(hContact), hContact);
}
+
void CSkypeInviteDlg::btnOk_OnOk(CCtrlButton*)
{
m_hContact = m_combo.GetItemData(m_combo.GetCurSel());
diff --git a/protocols/SkypeWeb/src/skype_trouter.cpp b/protocols/SkypeWeb/src/skype_trouter.cpp index 9a19dfaa9a..c89b9954a1 100644 --- a/protocols/SkypeWeb/src/skype_trouter.cpp +++ b/protocols/SkypeWeb/src/skype_trouter.cpp @@ -199,11 +199,11 @@ void CSkypeProto::OnTrouterEvent(const JSONNode &body, const JSONNode &) CMStringA service(FORMAT, "%s/IncomingCallCLE", GetContactProto(hContact));
cle.pszService = service.GetBuffer();
- CMStringW tooltip(FORMAT, TranslateT("Incoming call from %s"), pcli->pfnGetContactDisplayName(hContact, 0));
+ CMStringW tooltip(FORMAT, TranslateT("Incoming call from %s"), Clist_GetContactDisplayName(hContact));
cle.szTooltip.w = tooltip.GetBuffer();
pcli->pfnAddEvent(&cle);
- ShowNotification(pcli->pfnGetContactDisplayName(hContact, 0), TranslateT("Incoming call"), hContact, SKYPE_DB_EVENT_TYPE_INCOMING_CALL);
+ ShowNotification(Clist_GetContactDisplayName(hContact), TranslateT("Incoming call"), hContact, SKYPE_DB_EVENT_TYPE_INCOMING_CALL);
}
}
break;
|