diff options
Diffstat (limited to 'protocols/Skype/src/skype_events.cpp')
| -rw-r--r-- | protocols/Skype/src/skype_events.cpp | 33 |
1 files changed, 9 insertions, 24 deletions
diff --git a/protocols/Skype/src/skype_events.cpp b/protocols/Skype/src/skype_events.cpp index 8d48c579c7..9432284352 100644 --- a/protocols/Skype/src/skype_events.cpp +++ b/protocols/Skype/src/skype_events.cpp @@ -59,18 +59,7 @@ int CSkypeProto::OnContactDeleted(WPARAM wParam, LPARAM lParam) if (hContact && this->IsOnline())
{
if (this->IsChatRoom(hContact))
- {
- ptrW chatID(::db_get_wsa(hContact, this->m_szModuleName, SKYPE_SETTINGS_LOGIN));
- this->LeaveChat(chatID);
-
- ConversationRef conversation;
- this->GetConversationByIdentity(::mir_utf8encodeW(chatID), conversation);
- if (conversation)
- {
- conversation->RetireFrom();
- conversation->Delete();
- }
- }
+ this->DeleteChatRoom(hContact);
else
this->RevokeAuth(wParam, lParam);
}
@@ -180,18 +169,14 @@ int __cdecl CSkypeProto::OnTabSRMMButtonPressed(WPARAM wParam, LPARAM lParam) {
case BBB_ID_CONF_INVITE:
if (this->IsOnline() && this->IsChatRoom(hContact))
- {
- StringList targets = this->GetChatUsers(ptrW(::db_get_wsa(hContact, this->m_szModuleName, SKYPE_SETTINGS_LOGIN)));
-
- this->StartChat(targets);
- }
+ this->InviteToChatRoom(hContact);
break;
case BBB_ID_CONF_SPAWN:
if (this->IsOnline() && !this->IsChatRoom(hContact))
{
StringList targets;
- targets.insert(ptrW(::db_get_wsa(hContact, this->m_szModuleName, SKYPE_SETTINGS_LOGIN)));
+ targets.insert(ptrW(::db_get_wsa(hContact, this->m_szModuleName, SKYPE_SETTINGS_SID)));
this->StartChat(targets);
}
@@ -201,7 +186,7 @@ int __cdecl CSkypeProto::OnTabSRMMButtonPressed(WPARAM wParam, LPARAM lParam) return 1;
}
-void CSkypeProto::OnMessage (
+void CSkypeProto::OnMessage(
const MessageRef & message,
const bool & changesInboxTimestamp,
const MessageRef & supersedesHistoryMessage,
@@ -254,11 +239,11 @@ void CSkypeProto::OnMessage ( void CSkypeProto::OnConversationChanged(const ConversationRef &conversation, int prop)
{
- if (prop == Conversation::P_LOCAL_LIVESTATUS) - { - Conversation::LOCAL_LIVESTATUS liveStatus; - conversation->GetPropLocalLivestatus(liveStatus); - if (liveStatus == Conversation::RINGING_FOR_ME) + if (prop == Conversation::P_LOCAL_LIVESTATUS)
+ {
+ Conversation::LOCAL_LIVESTATUS liveStatus;
+ conversation->GetPropLocalLivestatus(liveStatus);
+ if (liveStatus == Conversation::RINGING_FOR_ME)
{
SEString data;
|