diff options
| author | Alexander Lantsev <aunsane@gmail.com> | 2013-07-03 19:45:53 +0000 |
|---|---|---|
| committer | Alexander Lantsev <aunsane@gmail.com> | 2013-07-03 19:45:53 +0000 |
| commit | aa312e59cd0065e20ffdf78cd49811ba0520c0bd (patch) | |
| tree | 2a098fa7c69c2868a801d1acb8f2842c4e37dcfe /protocols/Skype/src/skype_chat.cpp | |
| parent | 8ec882fcf4a57256daa439d85d29fcbf3a1d06af (diff) | |
Skype:
- fixed files(contacts) sending in conference (issue #397)
- fixes in contacts blocking
- some small fixes
git-svn-id: http://svn.miranda-ng.org/main/trunk@5223 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/Skype/src/skype_chat.cpp')
| -rw-r--r-- | protocols/Skype/src/skype_chat.cpp | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/protocols/Skype/src/skype_chat.cpp b/protocols/Skype/src/skype_chat.cpp index 8339ad386e..a16fdf0d73 100644 --- a/protocols/Skype/src/skype_chat.cpp +++ b/protocols/Skype/src/skype_chat.cpp @@ -1675,15 +1675,20 @@ void CSkypeProto::OnChatEvent(const ConversationRef &conversation, const Message {
room->OnEvent(conversation, message);
}
- else if(messageType != Message::RETIRED && messageType != Message::RETIRED_OTHERS)
+ else
{
- SEString data;
+ Conversation::MY_STATUS status;
+ conversation->GetPropMyStatus(status);
+ if (status != Conversation::RETIRED_FORCEFULLY || status != Conversation::RETIRED_FORCEFULLY)
+ {
+ SEString data;
- conversation->GetPropDisplayname(data);
- ptrW name = ::mir_utf8decodeW(data);
+ conversation->GetPropDisplayname(data);
+ ptrW name = ::mir_utf8decodeW(data);
- ChatRoom *room = new ChatRoom(cid, name, this);
- room->Start(conversation, true);
+ ChatRoom *room = new ChatRoom(cid, name, this);
+ room->Start(conversation, true);
+ }
}
}
|