diff options
| author | George Hazan <ghazan@miranda.im> | 2017-09-12 12:14:57 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2017-09-12 12:14:57 +0300 |
| commit | 69409021aced78b31da0c9f2def7332a4c4b973e (patch) | |
| tree | 3d9a6607f042acb8d44ece5f3fb08a4125a94e45 /protocols/MSN | |
| parent | e09448dd03e3647717166e92ee818e395041993a (diff) | |
Revert "Merge branch 'master' of https://github.com/miranda-ng/miranda-ng"
This reverts commit e09448dd03e3647717166e92ee818e395041993a, reversing
changes made to b0f44b16bd1138de85a5d17bb42151742f9c8298.
Diffstat (limited to 'protocols/MSN')
| -rw-r--r-- | protocols/MSN/src/msn_commands.cpp | 2 | ||||
| -rw-r--r-- | protocols/MSN/src/msn_mail.cpp | 2 | ||||
| -rw-r--r-- | protocols/MSN/src/msn_proto.cpp | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/protocols/MSN/src/msn_commands.cpp b/protocols/MSN/src/msn_commands.cpp index 2f7d21d088..f8662107a3 100644 --- a/protocols/MSN/src/msn_commands.cpp +++ b/protocols/MSN/src/msn_commands.cpp @@ -718,7 +718,7 @@ void CMsnProto::MSN_ProcessNotificationMessage(char* buf, size_t len) mir_snprintf((fullurl + sz), (_countof(fullurl) - sz), "notification_id=%s&message_id=%s",
ezxml_attr(xmlnot, "id"), ezxml_attr(xmlmsg, "id"));
- Skin_PlaySound(alertsoundname);
+ SkinPlaySound(alertsoundname);
wchar_t* alrt = mir_utf8decodeW(ezxml_txt(xmltxt));
MSN_ShowPopup(TranslateT("MSN Alert"), alrt, MSN_ALERT_POPUP | MSN_ALLOW_MSGBOX, fullurl);
diff --git a/protocols/MSN/src/msn_mail.cpp b/protocols/MSN/src/msn_mail.cpp index 7bc2b7fb33..dd385c6070 100644 --- a/protocols/MSN/src/msn_mail.cpp +++ b/protocols/MSN/src/msn_mail.cpp @@ -304,7 +304,7 @@ void CMsnProto::sttNotificationMessage(char* msgBody, bool isInitial) // Disable to notify receiving hotmail
if (ShowPopup && !getByte("DisableHotmail", 0)) {
- Skin_PlaySound(mailsoundname);
+ SkinPlaySound(mailsoundname);
const char *msgurl = tFileInfo["Message-URL"];
if (msgurl) {
diff --git a/protocols/MSN/src/msn_proto.cpp b/protocols/MSN/src/msn_proto.cpp index dbce865552..57e190da30 100644 --- a/protocols/MSN/src/msn_proto.cpp +++ b/protocols/MSN/src/msn_proto.cpp @@ -114,11 +114,11 @@ CMsnProto::CMsnProto(const char* aProtoName, const wchar_t* aUserName) : mailsoundname = (char*)mir_alloc(64);
mir_snprintf(mailsoundname, 64, "%s:Hotmail", m_szModuleName);
- Skin_AddSound(mailsoundname, m_tszUserName, LPGENW("Live Mail"));
+ SkinAddNewSoundExW(mailsoundname, m_tszUserName, LPGENW("Live Mail"));
alertsoundname = (char*)mir_alloc(64);
mir_snprintf(alertsoundname, 64, "%s:Alerts", m_szModuleName);
- Skin_AddSound(alertsoundname, m_tszUserName, LPGENW("Live Alert"));
+ SkinAddNewSoundExW(alertsoundname, m_tszUserName, LPGENW("Live Alert"));
AvatarQueue_Init();
InitCustomFolders();
|