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/SecureIM/src/crypt_popups.cpp | 4 ++-- plugins/SecureIM/src/main.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'plugins/SecureIM/src') diff --git a/plugins/SecureIM/src/crypt_popups.cpp b/plugins/SecureIM/src/crypt_popups.cpp index fbced3dd22..3bd02356dc 100644 --- a/plugins/SecureIM/src/crypt_popups.cpp +++ b/plugins/SecureIM/src/crypt_popups.cpp @@ -92,12 +92,12 @@ void showPopupSM(MCONTACT hContact) { if (db_get_b(0, MODULENAME, "ss", 0)) showPopup(sim009, hContact, g_hPOP[POP_PU_MSS], 2); - Skin_PlaySound("OutgoingSecureMessage"); + SkinPlaySound("OutgoingSecureMessage"); } void showPopupRM(MCONTACT hContact) { if (db_get_b(0, MODULENAME, "sr", 0)) showPopup(sim010, hContact, g_hPOP[POP_PU_MSR], 2); - Skin_PlaySound("IncomingSecureMessage"); + SkinPlaySound("IncomingSecureMessage"); } diff --git a/plugins/SecureIM/src/main.cpp b/plugins/SecureIM/src/main.cpp index 22a5ef4749..3e80b7db39 100644 --- a/plugins/SecureIM/src/main.cpp +++ b/plugins/SecureIM/src/main.cpp @@ -211,8 +211,8 @@ static int onModulesLoaded(WPARAM, LPARAM) loadContactList(); // add new skin sound - Skin_AddSound("IncomingSecureMessage", LPGENW("SecureIM"), LPGENW("Incoming Secure Message"), L"Sounds\\iSecureMessage.wav"); - Skin_AddSound("OutgoingSecureMessage", LPGENW("SecureIM"), LPGENW("Outgoing Secure Message"), L"Sounds\\oSecureMessage.wav"); + SkinAddNewSoundEx("IncomingSecureMessage", LPGEN("SecureIM"), LPGEN("Incoming Secure Message"), "Sounds\\iSecureMessage.wav"); + SkinAddNewSoundEx("OutgoingSecureMessage", LPGEN("SecureIM"), LPGEN("Outgoing Secure Message"), "Sounds\\oSecureMessage.wav"); // init extra icons for (int i = 0; i < _countof(g_IEC); i++) -- cgit v1.2.3