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/SMS/src | |
| 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/SMS/src')
| -rw-r--r-- | plugins/SMS/src/SMSConstans.h | 1 | ||||
| -rw-r--r-- | plugins/SMS/src/SMS_svc.cpp | 4 | ||||
| -rw-r--r-- | plugins/SMS/src/receive.cpp | 6 |
3 files changed, 5 insertions, 6 deletions
diff --git a/plugins/SMS/src/SMSConstans.h b/plugins/SMS/src/SMSConstans.h index 9a48672f9f..b212510210 100644 --- a/plugins/SMS/src/SMSConstans.h +++ b/plugins/SMS/src/SMSConstans.h @@ -2,7 +2,6 @@ #define AFX_SMS_CONSTANS_H__F58D13FF_F6F2_476C_B8F0_7B9E9357CF48__INCLUDED_
#define PROTOCOL_NAMEA "SMSPlugin"
-#define PROTOCOL_NAMEW L"SMSPlugin"
#define PROTOCOL_NAME_LEN (sizeof(PROTOCOL_NAMEA)-1)
#define PROTOCOL_NAME_SIZE sizeof(PROTOCOL_NAMEA)
#define PROTOCOL_DISPLAY_NAME_ORIG "SMS"
diff --git a/plugins/SMS/src/SMS_svc.cpp b/plugins/SMS/src/SMS_svc.cpp index b224343cd0..a88d44f33e 100644 --- a/plugins/SMS/src/SMS_svc.cpp +++ b/plugins/SMS/src/SMS_svc.cpp @@ -45,8 +45,8 @@ int LoadModules(void) mi.flags = CMIF_UNICODE;
ssSMSSettings.hContactMenuItems[0] = Menu_AddContactMenuItem(&mi);
- Skin_AddSound("RecvSMSMsg", PROTOCOL_NAMEW, LPGENW("Incoming SMS Message"));
- Skin_AddSound("RecvSMSConfirmation", PROTOCOL_NAMEW, LPGENW("Incoming SMS Confirmation"));
+ SkinAddNewSoundEx("RecvSMSMsg", PROTOCOL_NAMEA, LPGEN("Incoming SMS Message"));
+ SkinAddNewSoundEx("RecvSMSConfirmation", PROTOCOL_NAMEA, LPGEN("Incoming SMS Confirmation"));
RefreshAccountList(NULL, NULL);
diff --git a/plugins/SMS/src/receive.cpp b/plugins/SMS/src/receive.cpp index c576e2cdd3..28ad76e8c0 100644 --- a/plugins/SMS/src/receive.cpp +++ b/plugins/SMS/src/receive.cpp @@ -75,7 +75,7 @@ int handleAckSMS(WPARAM wParam, LPARAM lParam) if (hContact == NULL) {
if (RecvSMSWindowAdd(NULL, ICQEVENTTYPE_SMS, tszPhone, dwPhoneSize, (LPSTR)dbei.pBlob, dbei.cbBlob)) {
db_event_markRead(hContact, hResult);
- Skin_PlaySound("RecvSMSMsg");
+ SkinPlaySound("RecvSMSMsg");
}
}
}
@@ -224,7 +224,7 @@ int handleNewMessage(WPARAM hContact, LPARAM hDbEvent) if ((dbei.flags & DBEF_SENT) == 0)
if (dbei.eventType == ICQEVENTTYPE_SMS) {
if (dbei.cbBlob > MIN_SMS_DBEVENT_LEN) {
- Skin_PlaySound("RecvSMSMsg");
+ SkinPlaySound("RecvSMSMsg");
if (DB_SMS_GetByte(NULL, "AutoPopup", 0)) {
if (RecvSMSWindowAdd(hContact, ICQEVENTTYPE_SMS, NULL, 0, (LPSTR)dbei.pBlob, dbei.cbBlob))
db_event_markRead(hContact, hDbEvent);
@@ -245,7 +245,7 @@ int handleNewMessage(WPARAM hContact, LPARAM hDbEvent) }
}
else if (dbei.eventType == ICQEVENTTYPE_SMSCONFIRMATION) {
- Skin_PlaySound("RecvSMSConfirmation");
+ SkinPlaySound("RecvSMSConfirmation");
if (DB_SMS_GetByte(NULL, "AutoPopup", 0)) {
if (RecvSMSWindowAdd(hContact, ICQEVENTTYPE_SMSCONFIRMATION, NULL, 0, (LPSTR)dbei.pBlob, dbei.cbBlob))
db_event_delete(hContact, hDbEvent);
|