diff options
| author | Alexander Lantsev <aunsane@gmail.com> | 2013-05-05 09:33:58 +0000 |
|---|---|---|
| committer | Alexander Lantsev <aunsane@gmail.com> | 2013-05-05 09:33:58 +0000 |
| commit | 984502e64c8490ba7fb5ac0768762165953a0364 (patch) | |
| tree | e66c4fe0bf78cc58562ec7fe90cbc513ff07a5ff /protocols | |
| parent | a1f257c2d22299ad127a5298d69eb60d169e8d86 (diff) | |
- fix chat contact status
git-svn-id: http://svn.miranda-ng.org/main/trunk@4588 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols')
| -rw-r--r-- | protocols/Skype/src/skype_events.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/protocols/Skype/src/skype_events.cpp b/protocols/Skype/src/skype_events.cpp index c27bddb7f0..58450e7d2f 100644 --- a/protocols/Skype/src/skype_events.cpp +++ b/protocols/Skype/src/skype_events.cpp @@ -446,12 +446,12 @@ void CSkypeProto::OnMessage(CConversation::Ref conversation, CMessage::Ref messa for (uint i = 0; i < participants.size(); i++)
{
participants[i]->GetPropIdentity(data);
- mir_ptr<wchar_t> sid = ::mir_utf8decodeW(data);
+ std::wstring sid = ::mir_utf8decodeW(data);
- if (needToAdd.contains(sid) && !alreadyInChat.contains(sid))
+ if (needToAdd.contains(sid.c_str()) && !alreadyInChat.contains(sid.c_str()))
{
CContact::Ref contact;
- g_skype->GetContact((char *)mir_ptr<char>(::mir_utf8encodeW(sid)), contact);
+ g_skype->GetContact(std::string(::mir_utf8encodeW(sid.c_str())).c_str(), contact);
CContact::AVAILABILITY status;
contact->GetPropAvailability(status);
@@ -461,9 +461,9 @@ void CSkypeProto::OnMessage(CConversation::Ref conversation, CMessage::Ref messa this->AddChatContact(
cid,
- sid,
+ sid.c_str(),
CSkypeProto::Roles[rank],
- CSkypeProto::MirandaToSkypeStatus(status));
+ CSkypeProto::SkypeToMirandaStatus(status));
}
}
}
|