Skype:

- fixed messaging in chats
- fixed incoming transfer status (probably fixed #358)
- fixed #357

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

1 files changed, 6 insertions, 7 deletions

diff --git a/protocols/Skype/src/skype_proto.cpp b/protocols/Skype/src/skype_proto.cpp
index 455979e506..fad767da3e 100644
--- a/protocols/Skype/src/skype_proto.cpp
+++ b/protocols/Skype/src/skype_proto.cpp
@@ -149,7 +149,7 @@ HANDLE __cdecl CSkypeProto::FileAllow( HANDLE hContact, HANDLE hTransfer, const
 { 

 	uint oid = (uint)hTransfer;

 

-	CMessage *message = this->newMessage(oid);

+	MessageRef message(oid);

 

 	this->Log(L"Incoming file transfer is accepted");

 	CTransfer::Refs transfers;

@@ -157,18 +157,17 @@ HANDLE __cdecl CSkypeProto::FileAllow( HANDLE hContact, HANDLE hTransfer, const
 	for (uint i = 0; i < transfers.size(); i++)

 	{

 		bool success;

-		SEString name;

 		wchar_t fullPath[MAX_PATH] = {0};

-		transfers[i]->GetPropFilename(name);

-		::mir_sntprintf(fullPath, MAX_PATH, L"%s%s", szPath, ::mir_utf8decodeW(name));

+

+		SEString data;

+		transfers[i]->GetPropFilename(data);

+		ptrW name(::mir_utf8decodeW(data));

+		::mir_sntprintf(fullPath, MAX_PATH, L"%s%s", szPath, name);

 		if (!transfers[i]->Accept(::mir_u2a(fullPath), success) || !success)

 		{

-			delete message;

 			return 0;

 		}

 	}

-	

-	delete message;

 

 	return hTransfer; 

 }