From 69409021aced78b31da0c9f2def7332a4c4b973e Mon Sep 17 00:00:00 2001 From: George Hazan Date: Tue, 12 Sep 2017 12:14:57 +0300 Subject: Revert "Merge branch 'master' of https://github.com/miranda-ng/miranda-ng" This reverts commit e09448dd03e3647717166e92ee818e395041993a, reversing changes made to b0f44b16bd1138de85a5d17bb42151742f9c8298. --- protocols/SkypeWeb/src/skype_proto.cpp | 4 ++-- protocols/SkypeWeb/src/skype_trouter.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'protocols/SkypeWeb') diff --git a/protocols/SkypeWeb/src/skype_proto.cpp b/protocols/SkypeWeb/src/skype_proto.cpp index e6d76d9e10..cc90e0d25b 100644 --- a/protocols/SkypeWeb/src/skype_proto.cpp +++ b/protocols/SkypeWeb/src/skype_proto.cpp @@ -48,8 +48,8 @@ CSkypeProto::CSkypeProto(const char* protoName, const wchar_t* userName) : CreateDirectoryTreeW(m_tszAvatarFolder.c_str()); //sounds - Skin_AddSound("skype_inc_call", L"SkypeWeb", LPGENW("Incoming call sound")); - Skin_AddSound("skype_call_canceled", L"SkypeWeb", LPGENW("Incoming call canceled sound")); + SkinAddNewSoundEx("skype_inc_call", "SkypeWeb", LPGEN("Incoming call sound")); + SkinAddNewSoundEx("skype_call_canceled", "SkypeWeb", LPGEN("Incoming call canceled sound")); SkypeSetTimer(); diff --git a/protocols/SkypeWeb/src/skype_trouter.cpp b/protocols/SkypeWeb/src/skype_trouter.cpp index a34e35c8e9..668431554b 100644 --- a/protocols/SkypeWeb/src/skype_trouter.cpp +++ b/protocols/SkypeWeb/src/skype_trouter.cpp @@ -187,7 +187,7 @@ void CSkypeProto::OnTrouterEvent(const JSONNode &body, const JSONNode &) MCONTACT hContact = AddContact(uid.c_str(), true); MEVENT hEvent = AddDbEvent(SKYPE_DB_EVENT_TYPE_INCOMING_CALL, hContact, time(NULL), DBEF_READ, gp.c_str(), callId.c_str()); - Skin_PlaySound("skype_inc_call"); + SkinPlaySound("skype_inc_call"); CLISTEVENT cle = {}; cle.flags = CLEF_UNICODE; @@ -210,7 +210,7 @@ void CSkypeProto::OnTrouterEvent(const JSONNode &body, const JSONNode &) case 104: //call canceled: callerId=""; conversationId=NULL; callId=call id // std::string callId = body["callId"].as_string(); - Skin_PlaySound("skype_call_canceled"); + SkinPlaySound("skype_call_canceled"); break; } } -- cgit v1.2.3