From d095047014348c9e8dd72a72dc59b2abd22bbf9c Mon Sep 17 00:00:00 2001 From: George Hazan Date: Thu, 26 Sep 2019 19:09:59 +0300 Subject: SkypeWeb: erroneous Ignore management code removed --- protocols/SkypeWeb/src/skype_chatrooms.cpp | 1 - protocols/SkypeWeb/src/skype_contacts.cpp | 9 +++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/protocols/SkypeWeb/src/skype_chatrooms.cpp b/protocols/SkypeWeb/src/skype_chatrooms.cpp index 4760ae7899..b75fa2509f 100644 --- a/protocols/SkypeWeb/src/skype_chatrooms.cpp +++ b/protocols/SkypeWeb/src/skype_chatrooms.cpp @@ -109,7 +109,6 @@ int CSkypeProto::OnGroupChatEventHook(WPARAM, LPARAM lParam) setWord(hContact, "Status", ID_STATUS_ONLINE); db_set_b(hContact, "CList", "Hidden", 1); setWString(hContact, "Nick", gch->ptszUID); - db_set_dw(hContact, "Ignore", "Mask1", 0); } CallService(MS_MSG_SENDMESSAGEW, hContact, 0); } diff --git a/protocols/SkypeWeb/src/skype_contacts.cpp b/protocols/SkypeWeb/src/skype_contacts.cpp index a6d896302e..2961cda97d 100644 --- a/protocols/SkypeWeb/src/skype_contacts.cpp +++ b/protocols/SkypeWeb/src/skype_contacts.cpp @@ -181,13 +181,11 @@ void CSkypeProto::LoadContactList(const NETLIBHTTPREQUEST *response) else setByte(hContact, "Grant", 1); if (item["blocked"].as_bool()) { - db_set_dw(hContact, "Ignore", "Mask1", 127); db_set_b(hContact, "CList", "Hidden", 1); setByte(hContact, "IsBlocked", 1); } else { - db_set_dw(hContact, "Ignore", "Mask1", 0); - db_set_b(hContact, "CList", "Hidden", 0); + db_unset(hContact, "CList", "Hidden"); delSetting(hContact, "IsBlocked"); } @@ -287,7 +285,6 @@ void CSkypeProto::OnBlockContact(const NETLIBHTTPREQUEST *response, void *p) MCONTACT hContact = (DWORD_PTR)p; if (response == nullptr) return; - db_set_dw(hContact, "Ignore", "Mask1", 127); db_set_b(hContact, "CList", "Hidden", 1); } @@ -299,10 +296,10 @@ INT_PTR CSkypeProto::UnblockContact(WPARAM hContact, LPARAM) void CSkypeProto::OnUnblockContact(const NETLIBHTTPREQUEST *response, void *p) { - MCONTACT hContact = (DWORD_PTR)p; if (response == nullptr) return; - db_set_dw(hContact, "Ignore", "Mask1", 0); + + MCONTACT hContact = (DWORD_PTR)p; db_set_b(hContact, "CList", "Hidden", 0); delSetting(hContact, "IsBlocked"); } -- cgit v1.2.3