From 85f31b137eb97138e81a185185882d445903f84d Mon Sep 17 00:00:00 2001 From: George Hazan Date: Tue, 10 Feb 2015 21:31:29 +0000 Subject: sender's time ignored to prevent message reordering git-svn-id: http://svn.miranda-ng.org/main/trunk@12086 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/WhatsApp/src/messages.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'protocols/WhatsApp/src/messages.cpp') diff --git a/protocols/WhatsApp/src/messages.cpp b/protocols/WhatsApp/src/messages.cpp index 390ad9a5dc..4525e09b96 100644 --- a/protocols/WhatsApp/src/messages.cpp +++ b/protocols/WhatsApp/src/messages.cpp @@ -32,7 +32,7 @@ void WhatsAppProto::onMessageForMe(const FMessage &pMsg) PROTORECVEVENT recv = { 0 }; recv.flags = PREF_UTF; recv.szMessage = const_cast(msg.c_str()); - recv.timestamp = pMsg.timestamp; + recv.timestamp = time(NULL); ProtoChainRecvMsg(hContact, &recv); } @@ -124,9 +124,9 @@ void WhatsAppProto::onMessageStatusUpdate(const FMessage &fmsg) int msgId = atoi(fmsg.key.id.substr(delim+1).c_str()); ProtoBroadcastAck(hContact, ACKTYPE_MESSAGE, ACKRESULT_SUCCESS, (HANDLE)msgId, 0); - time_t timestamp = atol(fmsg.key.id.substr(0, delim).c_str()); + time_t ts = atol(fmsg.key.id.substr(0, delim).c_str()); TCHAR ttime[64]; - _tcsftime(ttime, SIZEOF(ttime), _T("%X"), localtime(×tamp)); + _tcsftime(ttime, SIZEOF(ttime), _T("%X"), localtime(&ts)); utils::setStatusMessage(hContact, CMString(FORMAT, TranslateT("Message received: %s by %s"), ttime, ptszBy)); } -- cgit v1.2.3