diff options
| author | George Hazan <ghazan@miranda.im> | 2023-02-10 12:54:20 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2023-02-10 12:54:20 +0300 |
| commit | ef0ba268b340eaf1217a96d763342c25668588b4 (patch) | |
| tree | 17396375e213043c2ce1c59b50b7f30488dcb83d /protocols/JabberG/src | |
| parent | 33733576589076f080ddfa000b899843016a2597 (diff) | |
Protocols: preventing recursive contact deletion
Diffstat (limited to 'protocols/JabberG/src')
| -rw-r--r-- | protocols/JabberG/src/jabber_iqid.cpp | 2 | ||||
| -rw-r--r-- | protocols/JabberG/src/jabber_thread.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/protocols/JabberG/src/jabber_iqid.cpp b/protocols/JabberG/src/jabber_iqid.cpp index 85e2397829..305b9e8ff6 100644 --- a/protocols/JabberG/src/jabber_iqid.cpp +++ b/protocols/JabberG/src/jabber_iqid.cpp @@ -532,7 +532,7 @@ void CJabberProto::OnIqResultGetRoster(const TiXmlElement *iqNode, CJabberIqInfo JABBER_LIST_ITEM *item = ListGetItemPtrFromIndex(i);
if (item && item->hContact && !item->bRealContact) {
debugLogA("Syncing roster: preparing to delete %s (hContact=0x%x)", item->jid, item->hContact);
- db_delete_contact(item->hContact);
+ db_delete_contact(item->hContact, true);
}
}
}
diff --git a/protocols/JabberG/src/jabber_thread.cpp b/protocols/JabberG/src/jabber_thread.cpp index a088f16c12..6daac6fa9c 100644 --- a/protocols/JabberG/src/jabber_thread.cpp +++ b/protocols/JabberG/src/jabber_thread.cpp @@ -1386,7 +1386,7 @@ void CJabberProto::OnProcessMessage(const TiXmlElement *node, ThreadData *info) else if (!mir_strcmp(action, "delete")) {
MCONTACT cc = HContactFromJID(jid);
if (cc)
- db_delete_contact(cc);
+ db_delete_contact(cc, true);
}
}
}
|