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

This reverts commit e09448dd03e3647717166e92ee818e395041993a, reversing
changes made to b0f44b16bd1138de85a5d17bb42151742f9c8298.

9 files changed, 31 insertions, 31 deletions

diff --git a/src/core/stdauth/src/auth.cpp b/src/core/stdauth/src/auth.cpp
index 7b5b3ae59b..e7074b4dbb 100644
--- a/src/core/stdauth/src/auth.cpp
+++ b/src/core/stdauth/src/auth.cpp
@@ -68,7 +68,7 @@ static int AuthEventAdded(WPARAM, LPARAM lParam)
 	ptrW szUid(Contact_GetInfo(CNF_UNIQUEID, hContact));

 

 	if (dbei.eventType == EVENTTYPE_AUTHREQUEST) {

-		Skin_PlaySound("AuthRequest");

+		SkinPlaySound("AuthRequest");

 		if (szUid)

 			mir_snwprintf(szTooltip, TranslateT("%s requests authorization"), szUid);

 		else

@@ -79,7 +79,7 @@ static int AuthEventAdded(WPARAM, LPARAM lParam)
 		pcli->pfnAddEvent(&cli);

 	}

 	else if (dbei.eventType == EVENTTYPE_ADDED) {

-		Skin_PlaySound("AddedEvent");

+		SkinPlaySound("AddedEvent");

 		if (szUid)

 			mir_snwprintf(szTooltip, TranslateT("%s added you to their contact list"), szUid);

 		else

@@ -98,7 +98,7 @@ int LoadSendRecvAuthModule(void)
 	CreateServiceFunction(MS_AUTH_SHOWADDED, ShowAddedWindow);

 	HookEvent(ME_DB_EVENT_ADDED, AuthEventAdded);

 

-	Skin_AddSound("AuthRequest", LPGENW("Alerts"), LPGENW("Authorization request"));

-	Skin_AddSound("AddedEvent", LPGENW("Alerts"), LPGENW("Added event"));

+	SkinAddNewSoundEx("AuthRequest", LPGEN("Alerts"), LPGEN("Authorization request"));

+	SkinAddNewSoundEx("AddedEvent", LPGEN("Alerts"), LPGEN("Added event"));

 	return 0;

 }

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);
diff --git a/src/core/stdmsg/src/globals.cpp b/src/core/stdmsg/src/globals.cpp
index 661837a1b2..4675677588 100644
--- a/src/core/stdmsg/src/globals.cpp
+++ b/src/core/stdmsg/src/globals.cpp
@@ -87,7 +87,7 @@ static int ackevent(WPARAM, LPARAM lParam)
 		msgQueue_processack(pAck->hContact, (INT_PTR)pAck->hProcess, pAck->result == ACKRESULT_SUCCESS, (char*)pAck->lParam);

 

 		if (pAck->result == ACKRESULT_SUCCESS)

-			Skin_PlaySound("SendMsg");

+			SkinPlaySound("SendMsg");

 	}

 	return 0;

 }

diff --git a/src/core/stdmsg/src/msgdialog.cpp b/src/core/stdmsg/src/msgdialog.cpp
index e3834976ff..7f418e285d 100644
--- a/src/core/stdmsg/src/msgdialog.cpp
+++ b/src/core/stdmsg/src/msgdialog.cpp
@@ -1148,9 +1148,9 @@ INT_PTR CSrmmWindow::DlgProc(UINT uMsg, WPARAM wParam, LPARAM lParam)
 				// Sounds *only* for sent messages, not for custom events

 				if (isMessage && !isSent) {

 					if (GetForegroundWindow() == m_pOwner->GetHwnd())

-						Skin_PlaySound("RecvMsgActive");

+						SkinPlaySound("RecvMsgActive");

 					else

-						Skin_PlaySound("RecvMsgInactive");

+						SkinPlaySound("RecvMsgInactive");

 				}

 				if (isMessage && !isSent) {

 					m_lastMessage = dbei.timestamp;

diff --git a/src/core/stdmsg/src/msgs.cpp b/src/core/stdmsg/src/msgs.cpp
index 1b2fa2a775..7df2891d00 100644
--- a/src/core/stdmsg/src/msgs.cpp
+++ b/src/core/stdmsg/src/msgs.cpp
@@ -72,18 +72,18 @@ static int MessageEventAdded(WPARAM hContact, LPARAM lParam)
 			ShowWindow(hwnd, SW_RESTORE);

 			SetWindowPos(hwnd, HWND_TOP, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_SHOWWINDOW);

 			SetForegroundWindow(hwnd);

-			Skin_PlaySound("RecvMsgActive");

+			SkinPlaySound("RecvMsgActive");

 		}

 		else {

 			if (GetForegroundWindow() == GetParent(hwnd))

-				Skin_PlaySound("RecvMsgActive");

+				SkinPlaySound("RecvMsgActive");

 			else

-				Skin_PlaySound("RecvMsgInactive");

+				SkinPlaySound("RecvMsgInactive");

 		}

 		return 0;

 	}

 	/* new message */

-	Skin_PlaySound("AlertMsg");

+	SkinPlaySound("AlertMsg");

 

 	char *szProto = GetContactProto(hContact);

 	if (szProto && (g_dat.openFlags & SRMMStatusToPf2(CallProtoService(szProto, PS_GETSTATUS, 0, 0)))) {

@@ -164,7 +164,7 @@ static int TypingMessage(WPARAM hContact, LPARAM lParam)
 

 	hContact = db_mc_tryMeta(hContact);

 

-	Skin_PlaySound((lParam) ? "TNStart" : "TNStop");

+	SkinPlaySound((lParam) ? "TNStart" : "TNStop");

 

 	HWND hwnd = Srmm_FindWindow(hContact);

 	if (hwnd)

@@ -511,13 +511,13 @@ int LoadSendRecvMessageModule(void)
 	CreateServiceFunction(MS_MSG_SENDMESSAGEW, SendMessageCommand_W);

 	CreateServiceFunction(MS_MSG_READMESSAGE, ReadMessageCommand);

 

-	Skin_AddSound("RecvMsgActive",   LPGENW("Instant messages"), LPGENW("Incoming (focused window)"));

-	Skin_AddSound("RecvMsgInactive", LPGENW("Instant messages"), LPGENW("Incoming (unfocused window)"));

-	Skin_AddSound("AlertMsg",        LPGENW("Instant messages"), LPGENW("Incoming (new session)"));

-	Skin_AddSound("SendMsg",         LPGENW("Instant messages"), LPGENW("Outgoing"));

-	Skin_AddSound("SendError",       LPGENW("Instant messages"), LPGENW("Message send error"));

-	Skin_AddSound("TNStart",         LPGENW("Instant messages"), LPGENW("Contact started typing"));

-	Skin_AddSound("TNStop",          LPGENW("Instant messages"), LPGENW("Contact stopped typing"));

+	SkinAddNewSoundEx("RecvMsgActive", LPGEN("Instant messages"), LPGEN("Incoming (focused window)"));

+	SkinAddNewSoundEx("RecvMsgInactive", LPGEN("Instant messages"), LPGEN("Incoming (unfocused window)"));

+	SkinAddNewSoundEx("AlertMsg", LPGEN("Instant messages"), LPGEN("Incoming (new session)"));

+	SkinAddNewSoundEx("SendMsg", LPGEN("Instant messages"), LPGEN("Outgoing"));

+	SkinAddNewSoundEx("SendError", LPGEN("Instant messages"), LPGEN("Message send error"));

+	SkinAddNewSoundEx("TNStart", LPGEN("Instant messages"), LPGEN("Contact started typing"));

+	SkinAddNewSoundEx("TNStop", LPGEN("Instant messages"), LPGEN("Contact stopped typing"));

 

 	InitStatusIcons();

 	return 0;

diff --git a/src/core/stdmsg/src/msgtimedout.cpp b/src/core/stdmsg/src/msgtimedout.cpp
index e0ce1ad97c..7596198ce5 100644
--- a/src/core/stdmsg/src/msgtimedout.cpp
+++ b/src/core/stdmsg/src/msgtimedout.cpp
@@ -93,7 +93,7 @@ void MessageFailureProcess(TMsgQueue *item, const char* err)
 	}

 	else SendMessage(hwnd, DM_REMAKELOG, 0, 0);

 

-	Skin_PlaySound("SendError");

+	SkinPlaySound("SendError");

 

 	ErrorDlgParam param = { err, item };

 	CreateDialogParam(g_hInst, MAKEINTRESOURCE(IDD_MSGSENDERROR), hwnd, ErrorDlgProc, (LPARAM)&param);

diff --git a/src/core/stduseronline/src/useronline.cpp b/src/core/stduseronline/src/useronline.cpp
index b7ff2473b0..3ac251408d 100644
--- a/src/core/stduseronline/src/useronline.cpp
+++ b/src/core/stduseronline/src/useronline.cpp
@@ -65,7 +65,7 @@ static int UserOnlineSettingChanged(WPARAM hContact, LPARAM lParam)
 				pcli->pfnAddEvent(&cle);

 				IcoLib_ReleaseIcon(cle.hIcon, 0);

                 db_set_dw(cle.hContact, "UserOnline", "LastEvent", (DWORD)cle.hDbEvent);

-				Skin_PlaySound("UserOnline");

+				SkinPlaySound("UserOnline");

 			}

 		}

 	}

@@ -117,6 +117,6 @@ int LoadUserOnlineModule(void)
 	HookEvent(ME_PROTO_ACK, UserOnlineAck);

 	HookEvent(ME_SYSTEM_MODULESLOADED, UserOnlineModulesLoaded);

 	HookEvent(ME_PROTO_ACCLISTCHANGED, UserOnlineAccountsChanged);

-	Skin_AddSound("UserOnline", LPGENW("Alerts"), LPGENW("Online"));

+	SkinAddNewSoundEx("UserOnline", LPGEN("Alerts"), LPGEN("Online"));

 	return 0;

 }