diff options
| author | George Hazan <george.hazan@gmail.com> | 2024-01-23 19:05:51 +0300 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2024-01-23 19:05:51 +0300 |
| commit | 60fec7a89a7870d52ebd76315193b105973b1219 (patch) | |
| tree | 8df3b928516934d478367791bf5b8d2f4b92a930 /protocols/JabberG/src | |
| parent | 14b6b214743b1913258fc03c21f5e0841a66c2fd (diff) | |
fixes #4104 (Удаление серверной истории)
Diffstat (limited to 'protocols/JabberG/src')
| -rw-r--r-- | protocols/JabberG/src/jabber_events.cpp | 2 | ||||
| -rw-r--r-- | protocols/JabberG/src/jabber_iqid.cpp | 2 | ||||
| -rw-r--r-- | protocols/JabberG/src/jabber_proto.h | 2 | ||||
| -rw-r--r-- | protocols/JabberG/src/jabber_thread.cpp | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/protocols/JabberG/src/jabber_events.cpp b/protocols/JabberG/src/jabber_events.cpp index 6f5aec66ac..cf3c2f92a7 100644 --- a/protocols/JabberG/src/jabber_events.cpp +++ b/protocols/JabberG/src/jabber_events.cpp @@ -31,7 +31,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. /////////////////////////////////////////////////////////////////////////////////////////
// OnContactDeleted - processes a contact deletion
-bool CJabberProto::OnContactDeleted(MCONTACT hContact)
+bool CJabberProto::OnContactDeleted(MCONTACT hContact, uint32_t)
{
if (!m_bJabberOnline) // should never happen
return false;
diff --git a/protocols/JabberG/src/jabber_iqid.cpp b/protocols/JabberG/src/jabber_iqid.cpp index fb350691f8..f2d6d3b8a9 100644 --- a/protocols/JabberG/src/jabber_iqid.cpp +++ b/protocols/JabberG/src/jabber_iqid.cpp @@ -513,7 +513,7 @@ void CJabberProto::OnIqResultGetRoster(const TiXmlElement *iqNode, CJabberIqInfo auto *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, true);
+ db_delete_contact(item->hContact, CDF_FROM_SERVER);
}
}
}
diff --git a/protocols/JabberG/src/jabber_proto.h b/protocols/JabberG/src/jabber_proto.h index 920e1a4e29..74265aca85 100644 --- a/protocols/JabberG/src/jabber_proto.h +++ b/protocols/JabberG/src/jabber_proto.h @@ -149,7 +149,7 @@ struct CJabberProto : public PROTO<CJabberProto>, public IJabberInterface int UserIsTyping(MCONTACT hContact, int type) override;
void OnBuildProtoMenu(void) override;
- bool OnContactDeleted(MCONTACT) override;
+ bool OnContactDeleted(MCONTACT, uint32_t flags) override;
MWindow OnCreateAccMgrUI(MWindow) override;
void OnMarkRead(MCONTACT, MEVENT) override;
void OnModulesLoaded() override;
diff --git a/protocols/JabberG/src/jabber_thread.cpp b/protocols/JabberG/src/jabber_thread.cpp index 92f490d104..27fe3246a9 100644 --- a/protocols/JabberG/src/jabber_thread.cpp +++ b/protocols/JabberG/src/jabber_thread.cpp @@ -1370,7 +1370,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, true);
+ db_delete_contact(cc, CDF_FROM_SERVER);
}
}
}
|