diff options
| author | Rozhuk Ivan <rozhuk.im@gmail.com> | 2014-03-06 01:16:01 +0000 |
|---|---|---|
| committer | Rozhuk Ivan <rozhuk.im@gmail.com> | 2014-03-06 01:16:01 +0000 |
| commit | 522586d7b8f7274fad2fe58c2615fc0d06618fcd (patch) | |
| tree | 0a1e22eacb864e035af10f11021816d83163d974 /protocols/MRA/src/Mra_proto.cpp | |
| parent | d5adcdbd5c1fda81f1be805dadc8021837ed706d (diff) | |
MRA
* Fix: SMS sending
SMS
* Fix: windows sizes then aero enabled
* Fix: ICQEVENTTYPE_SMSCONFIRMATION db event write
NewEventNotify
+ Add: support event types: ICQEVENTTYPE_SMS and ICQEVENTTYPE_SMSCONFIRMATION
git-svn-id: http://svn.miranda-ng.org/main/trunk@8423 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/MRA/src/Mra_proto.cpp')
| -rw-r--r-- | protocols/MRA/src/Mra_proto.cpp | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/protocols/MRA/src/Mra_proto.cpp b/protocols/MRA/src/Mra_proto.cpp index 9fcea8eeb0..e1840dc275 100644 --- a/protocols/MRA/src/Mra_proto.cpp +++ b/protocols/MRA/src/Mra_proto.cpp @@ -1520,19 +1520,15 @@ bool CMraProto::MraCommandDispatcher(mrim_packet_header_t *pmaHeader) case MRIM_CS_SMS_ACK:
buf >> dwTemp;
if (MraSendQueueFind(hSendQueueHandle, pmaHeader->seq, NULL, &hContact, &dwAckType, &pByte, &dwSize) == NO_ERROR) {
+ /* pByte point to phone number ansi string. */
+ /* dwAckType = ICQACKTYPE_SMS */
CMStringA szEmail;
if (mraGetStringA(NULL, "e-mail", szEmail)) {
- DWORD dwPhoneSize = *(DWORD*)pByte;
- DWORD dwMessageSize = dwSize - (dwPhoneSize + sizeof(DWORD)+2);
- LPSTR lpszPhone = (LPSTR)pByte + sizeof(DWORD);
- LPWSTR lpwszMessage = (LPWSTR)(lpszPhone + dwPhoneSize + 1);
-
- mir_snprintf((LPSTR)szBuff, SIZEOF(szBuff),
+ mir_snprintf((LPSTR)szBuff, sizeof(szBuff),
"<sms_response><source>Mail.ru</source><deliverable>Yes</deliverable><network>Mail.ru, Russia</network><message_id>%s-1-1955988055-%s</message_id><destination>%s</destination><messages_left>0</messages_left></sms_response>\r\n",
- szEmail.c_str(), lpszPhone, lpszPhone);
- ProtoBroadcastAck(NULL, dwAckType, ACKRESULT_SENTREQUEST, (HANDLE)pmaHeader->seq, (LPARAM)szBuff);
+ szEmail.c_str(), (LPSTR)pByte, (LPSTR)pByte);
+ ProtoBroadcastAck(NULL, ICQACKTYPE_SMS, ACKRESULT_SENTREQUEST, (HANDLE)pmaHeader->seq, (LPARAM)szBuff);
}
-
mir_free(pByte);
MraSendQueueFree(hSendQueueHandle, pmaHeader->seq);
}
|