diff options
| author | Alexander Lantsev <aunsane@gmail.com> | 2013-05-11 14:49:09 +0000 |
|---|---|---|
| committer | Alexander Lantsev <aunsane@gmail.com> | 2013-05-11 14:49:09 +0000 |
| commit | 59328dff21b246ffee24cfd45dfe36b65c76e916 (patch) | |
| tree | de615a28bb2d43f126ca6a0928364dfc2704c424 /protocols/Skype/src/skype_events.cpp | |
| parent | e0fe91da0455894d26e6d804f9028e0c3efb6d59 (diff) | |
- fix own nick in chat log
- add thread sync on contact searching in db
git-svn-id: http://svn.miranda-ng.org/main/trunk@4632 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/Skype/src/skype_events.cpp')
| -rw-r--r-- | protocols/Skype/src/skype_events.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/protocols/Skype/src/skype_events.cpp b/protocols/Skype/src/skype_events.cpp index a89729a46f..63f5bebb84 100644 --- a/protocols/Skype/src/skype_events.cpp +++ b/protocols/Skype/src/skype_events.cpp @@ -244,9 +244,8 @@ void CSkypeProto::OnChatMessageSent(CConversation::Ref &conversation, CMessage:: conversation->GetPropIdentity(data);
mir_ptr<wchar_t> cid( ::mir_utf8decodeW(data));
- mir_ptr<wchar_t> nick( ::db_get_wsa(NULL, this->m_szModuleName, "Nick"));
- if (::wcsicmp(nick, L"") == 0)
- nick = ::db_get_wsa(NULL, this->m_szModuleName, SKYPE_SETTINGS_LOGIN);
+ message->GetPropAuthor(data);
+ mir_ptr<wchar_t> sid( ::mir_utf8decodeW(data));
CMessage::TYPE messageType;
message->GetPropType(messageType);
@@ -254,7 +253,7 @@ void CSkypeProto::OnChatMessageSent(CConversation::Ref &conversation, CMessage:: //this->SendChatMessage(cid, nick, mir_ptr<wchar_t>(::mir_utf8decodeW(text)));
this->RaiseChatEvent(
cid,
- nick,
+ sid,
messageType == CMessage::POSTED_TEXT ? /*GC_EVENT_MESSAGE */ 0x0040 : /*GC_EVENT_ACTION */ 0x0200,
/*GCEF_ADDTOLOG*/ 0x0001,
0,
|