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 /plugins/Scriver/src/msgs.cpp | |
| 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 'plugins/Scriver/src/msgs.cpp')
| -rw-r--r-- | plugins/Scriver/src/msgs.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/plugins/Scriver/src/msgs.cpp b/plugins/Scriver/src/msgs.cpp index 26ee901ae6..d7a2e05b74 100644 --- a/plugins/Scriver/src/msgs.cpp +++ b/plugins/Scriver/src/msgs.cpp @@ -106,7 +106,7 @@ static int MessageEventAdded(WPARAM hContact, LPARAM lParam) /* does a window for the contact exist? */
if (hwnd == nullptr) {
/* new message */
- Skin_PlaySound("AlertMsg");
+ SkinPlaySound("AlertMsg");
if (IsAutoPopup(hContact)) {
(new CSrmmWindow(hContact, true))->Show();
return 0;
@@ -188,7 +188,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)
@@ -647,12 +647,12 @@ int OnLoadModule(void) CreateServiceFunction(MS_MSG_SENDMESSAGEW, SendMessageCommandW);
CreateServiceFunction(MS_MSG_TYPINGMESSAGE, TypingMessageCommand);
- 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("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("TNStart", LPGEN("Instant messages"), LPGEN("Contact started typing"));
+ SkinAddNewSoundEx("TNStop", LPGEN("Instant messages"), LPGEN("Contact stopped typing"));
hDragCursor = LoadCursor(g_hInst, MAKEINTRESOURCE(IDC_DRAGCURSOR));
|