- fix for hangup;

- fix for guid processing

git-svn-id: http://svn.miranda-ng.org/main/trunk@4603 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

1 files changed, 3 insertions, 12 deletions

diff --git a/protocols/Skype/src/skype_messages.cpp b/protocols/Skype/src/skype_messages.cpp
index 31d08c19f9..7d7f3347e6 100644
--- a/protocols/Skype/src/skype_messages.cpp
+++ b/protocols/Skype/src/skype_messages.cpp
@@ -8,11 +8,8 @@ int CSkypeProto::OnMessagePreCreate(WPARAM, LPARAM lParam)
 	SEBinary guid;

 	if (message->GetPropGuid(guid))

 	{

-		char *cguid = ::mir_strdup(guid.data());

-		cguid[guid.size()] = 0;

-

 		evt->dbei->pBlob = (PBYTE)::mir_realloc(evt->dbei->pBlob, evt->dbei->cbBlob + guid.size());

-		::memcpy((char *)&evt->dbei->pBlob[evt->dbei->cbBlob], cguid, guid.size());

+		::memcpy((char *)&evt->dbei->pBlob[evt->dbei->cbBlob], guid.data(), guid.size());

 		evt->dbei->cbBlob += (DWORD)guid.size();

 	}

 

@@ -45,13 +42,10 @@ void CSkypeProto::OnMessageReceived(CConversation::Ref &conversation, CMessage::
 	SEBinary guid;

 	message->GetPropGuid(guid);

 

-	char *cguid = ::mir_strdup(guid.data());

-	cguid[guid.size()] = 0;

-

 	this->RaiseMessageReceivedEvent(

 		hContact,

 		timestamp, 

-		cguid,

+		guid,

 		text,

 		status == CMessage::UNCONSUMED_NORMAL);

 }

@@ -93,13 +87,10 @@ void CSkypeProto::OnMessageSended(CConversation::Ref &conversation, CMessage::Re
 	SEBinary guid;

 	message->GetPropGuid(guid);

 

-	char *cguid = ::mir_strdup(guid.data());

-	cguid[guid.size()] = 0;

-

 	this->RaiseMessageSendedEvent(

 		hContact,

 		timestamp,

-		cguid,

+		guid,

 		text,

 		status == CMessage::UNCONSUMED_NORMAL);

 }