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. --- plugins/Weather/src/weather.cpp | 4 ++-- plugins/Weather/src/weather_update.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'plugins/Weather') diff --git a/plugins/Weather/src/weather.cpp b/plugins/Weather/src/weather.cpp index 94327bc8e4..827b5514eb 100644 --- a/plugins/Weather/src/weather.cpp +++ b/plugins/Weather/src/weather.cpp @@ -226,8 +226,8 @@ extern "C" int __declspec(dllexport) Load(void) InitServices(); // add sound event - Skin_AddSound("weatherupdated", _A2W(WEATHERPROTONAME), LPGENW("Weather Condition Changed")); - Skin_AddSound("weatheralert", _A2W(WEATHERPROTONAME), LPGENW("Weather Alert Issued")); + SkinAddNewSoundExW("weatherupdated", _A2W(WEATHERPROTONAME), LPGENW("Weather Condition Changed")); + SkinAddNewSoundExW("weatheralert", _A2W(WEATHERPROTONAME), LPGENW("Weather Alert Issued")); // window needed for popup commands wchar_t SvcFunc[100]; diff --git a/plugins/Weather/src/weather_update.cpp b/plugins/Weather/src/weather_update.cpp index 02d5129fab..3054f13e3c 100644 --- a/plugins/Weather/src/weather_update.cpp +++ b/plugins/Weather/src/weather_update.cpp @@ -110,7 +110,7 @@ int UpdateWeather(MCONTACT hContact) // alert issued, set display to italic if (opt.MakeItalic) db_set_w(hContact, WEATHERPROTONAME, "ApparentMode", ID_STATUS_OFFLINE); - Skin_PlaySound("weatheralert"); + SkinPlaySound("weatheralert"); } // alert dropped, set the display back to normal else db_unset(hContact, WEATHERPROTONAME, "ApparentMode"); @@ -162,7 +162,7 @@ int UpdateWeather(MCONTACT hContact) // logging if (Ch) { // play the sound event - Skin_PlaySound("weatherupdated"); + SkinPlaySound("weatherupdated"); if (db_get_b(hContact, WEATHERPROTONAME, "File", 0)) { // external log -- cgit v1.2.3