diff options
| author | George Hazan <george.hazan@gmail.com> | 2013-05-09 10:59:50 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2013-05-09 10:59:50 +0000 |
| commit | 00145f285b89e19f3bf03b73f9fe10974240b48f (patch) | |
| tree | 1405a6ceb876c0bd597b9dcf3505b23d61a07bc5 /protocols/Skype/src/skype_messages.cpp | |
| parent | fa8d719d6352843c62d96f9f4fe8e5d8124720f4 (diff) | |
- fake ack params thread reenabled;
- Sended replaced with Sent;
git-svn-id: http://svn.miranda-ng.org/main/trunk@4605 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/Skype/src/skype_messages.cpp')
| -rw-r--r-- | protocols/Skype/src/skype_messages.cpp | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/protocols/Skype/src/skype_messages.cpp b/protocols/Skype/src/skype_messages.cpp index 7d7f3347e6..e131194a45 100644 --- a/protocols/Skype/src/skype_messages.cpp +++ b/protocols/Skype/src/skype_messages.cpp @@ -50,7 +50,9 @@ void CSkypeProto::OnMessageReceived(CConversation::Ref &conversation, CMessage:: status == CMessage::UNCONSUMED_NORMAL);
}
-void CSkypeProto::OnMessageSended(CConversation::Ref &conversation, CMessage::Ref &message)
+/////////////////////////////////////////////////////////////////////////////////////////
+
+void CSkypeProto::OnMessageSent(CConversation::Ref &conversation, CMessage::Ref &message)
{
SEString data;
@@ -78,21 +80,21 @@ void CSkypeProto::OnMessageSended(CConversation::Ref &conversation, CMessage::Re HANDLE hContact = this->AddContact(receiver);
- this->SendBroadcast(
- hContact,
- ACKTYPE_MESSAGE,
- sstatus == CMessage::FAILED_TO_SEND ? ACKRESULT_FAILED : ACKRESULT_SUCCESS,
- (HANDLE)message->getOID(), 0);
-
SEBinary guid;
message->GetPropGuid(guid);
- this->RaiseMessageSendedEvent(
+ this->RaiseMessageSentEvent(
hContact,
timestamp,
guid,
text,
status == CMessage::UNCONSUMED_NORMAL);
+
+ this->SendBroadcastAsync(
+ hContact,
+ ACKTYPE_MESSAGE,
+ sstatus == CMessage::FAILED_TO_SEND ? ACKRESULT_FAILED : ACKRESULT_SUCCESS,
+ (HANDLE)message->getOID(), 0);
}
void CSkypeProto::OnMessageEvent(CConversation::Ref conversation, CMessage::Ref message)
@@ -109,7 +111,7 @@ void CSkypeProto::OnMessageEvent(CConversation::Ref conversation, CMessage::Ref message->GetPropAuthor(author);
if (::wcsicmp(mir_ptr<wchar_t>(::mir_utf8decodeW(author)), this->login) == 0)
- this->OnMessageSended(conversation, message);
+ this->OnMessageSent(conversation, message);
else
this->OnMessageReceived(conversation, message);
}
|