From 326fdfc6425dd89b32e94c111d68a0384b8765a3 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 10 May 2013 19:13:36 +0000 Subject: hangup fix git-svn-id: http://svn.miranda-ng.org/main/trunk@4626 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/Skype/src/skype_proto.cpp | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) (limited to 'protocols/Skype/src/skype_proto.cpp') diff --git a/protocols/Skype/src/skype_proto.cpp b/protocols/Skype/src/skype_proto.cpp index ec39286302..eec50e2e38 100644 --- a/protocols/Skype/src/skype_proto.cpp +++ b/protocols/Skype/src/skype_proto.cpp @@ -285,26 +285,20 @@ int __cdecl CSkypeProto::RecvMsg(HANDLE hContact, PROTORECVEVENT* pre) this->Log(L"Incoming message"); ::db_unset(hContact, "CList", "Hidden"); - SEBinary *guid = (SEBinary*)pre->lParam; + ReadMessageParam *param = (ReadMessageParam*)pre->lParam; char *message = (char *)pre->szMessage; size_t msgLen = ::strlen(message) + 1; - message = (char *)::mir_realloc(message, msgLen + guid->size()); - ::memcpy((char *)&message[msgLen], guid->data(), guid->size()); - - CMessage::Ref skype_message; - g_skype->GetMessageByGuid(*guid, skype_message); - - CMessage::TYPE messageType; - skype_message->GetPropType(messageType); + message = (char *)::mir_realloc(message, msgLen + param->guid.size()); + ::memcpy((char *)&message[msgLen], param->guid.data(), param->guid.size()); return (INT_PTR)this->AddDBEvent( hContact, - messageType == CMessage::POSTED_TEXT ? EVENTTYPE_MESSAGE : SKYPE_DB_EVENT_TYPE_EMOTE, + param->msgType == CMessage::POSTED_TEXT ? EVENTTYPE_MESSAGE : SKYPE_DB_EVENT_TYPE_EMOTE, pre->timestamp, DBEF_UTF | ((pre->flags & PREF_CREATEREAD) ? DBEF_READ : 0), - DWORD(msgLen + guid->size()), + DWORD(msgLen + param->guid.size()), (PBYTE)message); } -- cgit v1.2.3