From 0a779cd8a38b07d39832adf27b39e8a673b69251 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 16 Dec 2019 12:33:29 +0300 Subject: fixes #2137 completely by adding "deleted" flag detection instead of using nickname --- protocols/ICQ-WIM/src/poll.cpp | 2 +- protocols/ICQ-WIM/src/server.cpp | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'protocols') diff --git a/protocols/ICQ-WIM/src/poll.cpp b/protocols/ICQ-WIM/src/poll.cpp index 738600bf27..f0d1291427 100644 --- a/protocols/ICQ-WIM/src/poll.cpp +++ b/protocols/ICQ-WIM/src/poll.cpp @@ -71,7 +71,7 @@ void CIcqProto::ProcessBuddyList(const JSONNode &ev) Menu_ShowItem(m_hUploadGroups, true); for (auto &it : m_arCache) - if (!it->m_bInList && getMStringW(it->m_hContact, "Nick") != "[deleted]") + if (!it->m_bInList && !getBool(it->m_hContact, "IcqDeleted")) Contact_RemoveFromList(it->m_hContact); RetrieveUserInfo(); diff --git a/protocols/ICQ-WIM/src/server.cpp b/protocols/ICQ-WIM/src/server.cpp index 5ded75c32d..3b05f11947 100644 --- a/protocols/ICQ-WIM/src/server.cpp +++ b/protocols/ICQ-WIM/src/server.cpp @@ -290,6 +290,9 @@ MCONTACT CIcqProto::ParseBuddyInfo(const JSONNode &buddy, MCONTACT hContact) if (var) setWString(hContact, "Nick", var.as_mstring()); + if (buddy["deleted"].as_bool()) + setByte(hContact, "IcqDeleted", 1); + Json2string(hContact, buddy, "emailId", "Email"); Json2string(hContact, buddy, "cellNumber", "Cellular"); Json2string(hContact, buddy, "phoneNumber", "Phone"); -- cgit v1.2.3