Revert "Merge branch 'master' of https://github.com/miranda-ng/miranda-ng"

This reverts commit e09448dd03e3647717166e92ee818e395041993a, reversing
changes made to b0f44b16bd1138de85a5d17bb42151742f9c8298.

3 files changed, 8 insertions, 8 deletions

diff --git a/plugins/PluginUpdater/src/DlgUpdate.cpp b/plugins/PluginUpdater/src/DlgUpdate.cpp
index 8aada80df1..6d54f2e342 100644
--- a/plugins/PluginUpdater/src/DlgUpdate.cpp
+++ b/plugins/PluginUpdater/src/DlgUpdate.cpp
@@ -87,7 +87,7 @@ static void ApplyUpdates(void *param)
 				// interrupt update as we require all components to be updated

 				Netlib_CloseHandle(nlc);

 				PostMessage(hDlg, UM_ERROR, 0, 0);

-				Skin_PlaySound("updatefailed");

+				SkinPlaySound("updatefailed");

 				return;

 			}

 			SetStringText(hwndList, i, TranslateT("Succeeded."));

@@ -121,7 +121,7 @@ static void ApplyUpdates(void *param)
 			}

 		}

 	}

-	Skin_PlaySound("updatecompleted");

+	SkinPlaySound("updatecompleted");

 

 #if MIRANDA_VER < 0x0A00

 	// 4) Change title of clist

@@ -429,7 +429,7 @@ static void DlgUpdateSilent(void *param)
 			if (!DownloadFile(pFileUrl, nlc)) {

 				// interrupt update as we require all components to be updated

 				Netlib_CloseHandle(nlc);

-				Skin_PlaySound("updatefailed");

+				SkinPlaySound("updatefailed");

 				delete &UpdateFiles;

 				return;

 			}

@@ -473,7 +473,7 @@ static void DlgUpdateSilent(void *param)
 		}

 	}

 	delete &UpdateFiles;

-	Skin_PlaySound("updatecompleted");

+	SkinPlaySound("updatecompleted");

 

 #if MIRANDA_VER < 0x0A00

 	// 4) Change title of clist

diff --git a/plugins/PluginUpdater/src/PluginUpdater.cpp b/plugins/PluginUpdater/src/PluginUpdater.cpp
index 49507acd15..9c09f5a6f9 100644
--- a/plugins/PluginUpdater/src/PluginUpdater.cpp
+++ b/plugins/PluginUpdater/src/PluginUpdater.cpp
@@ -126,8 +126,8 @@ extern "C" __declspec(dllexport) int Load(void)
 	InitEvents();

 

 	// add sounds

-	Skin_AddSound("updatecompleted", LPGENW("Plugin Updater"), LPGENW("Update completed"));

-	Skin_AddSound("updatefailed",    LPGENW("Plugin Updater"), LPGENW("Update failed"));

+	SkinAddNewSoundEx("updatecompleted", LPGEN("Plugin Updater"), LPGEN("Update completed"));

+	SkinAddNewSoundEx("updatefailed", LPGEN("Plugin Updater"), LPGEN("Update failed"));

 

 #if MIRANDA_VER >= 0x0A00

 	// Upgrade old settings

diff --git a/plugins/PluginUpdater/src/Utils.cpp b/plugins/PluginUpdater/src/Utils.cpp
index 7554c723ef..c136c5c20c 100644
--- a/plugins/PluginUpdater/src/Utils.cpp
+++ b/plugins/PluginUpdater/src/Utils.cpp
@@ -163,14 +163,14 @@ bool ParseHashes(const wchar_t *ptszUrl, ptrW &baseUrl, SERVLIST &arHashes)
 	if (!ret) {

 		Netlib_LogfW(hNetlibUser,L"Downloading list of available updates from %s failed",baseUrl);

 		ShowPopup(TranslateT("Plugin Updater"), TranslateT("An error occurred while checking for new updates."), POPUP_TYPE_ERROR);

-		Skin_PlaySound("updatefailed");

+		SkinPlaySound("updatefailed");

 		return false;

 	}

 

 	if(!unzip(pFileUrl.tszDiskPath, g_tszTempPath, NULL,true)) {

 		Netlib_LogfW(hNetlibUser,L"Unzipping list of available updates from %s failed",baseUrl);

 		ShowPopup(TranslateT("Plugin Updater"), TranslateT("An error occurred while checking for new updates."), POPUP_TYPE_ERROR);

-		Skin_PlaySound("updatefailed");

+		SkinPlaySound("updatefailed");

 		return false;

 	}