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

This reverts commit e09448dd03e3647717166e92ee818e395041993a, reversing
changes made to b0f44b16bd1138de85a5d17bb42151742f9c8298.

3 files changed, 9 insertions, 9 deletions

diff --git a/src/core/stdfile/src/file.cpp b/src/core/stdfile/src/file.cpp
index 3d391dd7a7..bc68940dd9 100644
--- a/src/core/stdfile/src/file.cpp
+++ b/src/core/stdfile/src/file.cpp
@@ -105,7 +105,7 @@ void PushFileEvent(MCONTACT hContact, MEVENT hdbe, LPARAM lParam)
 		CreateDialogParam(hInst, MAKEINTRESOURCE(IDD_FILERECV), NULL, DlgProcRecvFile, (LPARAM)&cle);

 	}

 	else {

-		Skin_PlaySound("RecvFile");

+		SkinPlaySound("RecvFile");

 

 		wchar_t szTooltip[256];

 		mir_snwprintf(szTooltip, TranslateT("File from %s"), pcli->pfnGetContactDisplayName(hContact, 0));

@@ -443,9 +443,9 @@ int LoadSendRecvFileModule(void)
 	CreateServiceFunction("SRFile/OpenContRecDir", openContRecDir);

 	CreateServiceFunction("SRFile/OpenRecDir", openRecDir);

 

-	Skin_AddSound("RecvFile",   LPGENW("File"), LPGENW("Incoming"));

-	Skin_AddSound("FileDone",   LPGENW("File"), LPGENW("Complete"));

-	Skin_AddSound("FileFailed", LPGENW("File"), LPGENW("Error"));

-	Skin_AddSound("FileDenied", LPGENW("File"), LPGENW("Denied"));

+	SkinAddNewSoundEx("RecvFile", LPGEN("File"), LPGEN("Incoming"));

+	SkinAddNewSoundEx("FileDone", LPGEN("File"), LPGEN("Complete"));

+	SkinAddNewSoundEx("FileFailed", LPGEN("File"), LPGEN("Error"));

+	SkinAddNewSoundEx("FileDenied", LPGEN("File"), LPGEN("Denied"));

 	return 0;

 }

diff --git a/src/core/stdfile/src/filerecvdlg.cpp b/src/core/stdfile/src/filerecvdlg.cpp
index 5f6baa2e04..7a9edaad87 100644
--- a/src/core/stdfile/src/filerecvdlg.cpp
+++ b/src/core/stdfile/src/filerecvdlg.cpp
@@ -388,7 +388,7 @@ INT_PTR CALLBACK DlgProcRecvFile(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l
 				EnableWindow(GetDlgItem(hwndDlg, IDC_FILEDIR), FALSE);

 				EnableWindow(GetDlgItem(hwndDlg, IDC_FILEDIRBROWSE), FALSE);

 				SetDlgItemText(hwndDlg, IDC_MSG, TranslateT("This file transfer has been canceled by the other side"));

-				Skin_PlaySound("FileDenied");

+				SkinPlaySound("FileDenied");

 				FlashWindow(hwndDlg, TRUE);

 			}

 			else if (ack->result != ACKRESULT_FILERESUME)

diff --git a/src/core/stdfile/src/filexferdlg.cpp b/src/core/stdfile/src/filexferdlg.cpp
index d3499bfcb8..ed875004c1 100644
--- a/src/core/stdfile/src/filexferdlg.cpp
+++ b/src/core/stdfile/src/filexferdlg.cpp
@@ -624,16 +624,16 @@ INT_PTR CALLBACK DlgProcFileTransfer(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR
 
 				if (ack->result == ACKRESULT_DENIED) {
 					dat->fs = NULL; /* protocol will free structure */
-					Skin_PlaySound("FileDenied");
+					SkinPlaySound("FileDenied");
 					SetFtStatus(hwndDlg, LPGENW("File transfer denied"), FTS_TEXT);
 				}
 				else if (ack->result == ACKRESULT_FAILED) {
 					dat->fs = NULL; /* protocol will free structure */
-					Skin_PlaySound("FileFailed");
+					SkinPlaySound("FileFailed");
 					SetFtStatus(hwndDlg, LPGENW("File transfer failed"), FTS_TEXT);
 				}
 				else {
-					Skin_PlaySound("FileDone");
+					SkinPlaySound("FileDone");
 					if (dat->send) {
 						dat->fs = NULL; /* protocol will free structure */
 						SetFtStatus(hwndDlg, LPGENW("Transfer completed."), FTS_TEXT);