diff options
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);
+ }
}
}
|