diff options
| author | George Hazan <ghazan@miranda.im> | 2020-06-26 15:35:48 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2020-06-26 15:35:48 +0300 |
| commit | 6810c23ee8e069c9156349638e1bad770854372e (patch) | |
| tree | 8618042185a37d87146b0064510de103c05a831b /protocols/JabberG/src/jabber_menu.cpp | |
| parent | 8812196b63efdbee7d4434318d89f9bd0e408138 (diff) | |
Revert "Jabber: XEP-0136 support removed"
This reverts commit e6bf9c2a41622424c2cd4006326455e08c80812a.
# Conflicts:
# protocols/JabberG/src/jabber_caps.cpp
# protocols/JabberG/src/jabber_caps.h
# protocols/JabberG/src/jabber_iqid.cpp
Diffstat (limited to 'protocols/JabberG/src/jabber_menu.cpp')
| -rw-r--r-- | protocols/JabberG/src/jabber_menu.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/protocols/JabberG/src/jabber_menu.cpp b/protocols/JabberG/src/jabber_menu.cpp index 92acc5ca6d..6bb8ec5444 100644 --- a/protocols/JabberG/src/jabber_menu.cpp +++ b/protocols/JabberG/src/jabber_menu.cpp @@ -803,8 +803,8 @@ int CJabberProto::OnProcessSrmmEvent(WPARAM, LPARAM lParam) ptrA jid(getUStringA(event->hContact, "jid"));
if (jid != nullptr) {
JABBER_LIST_ITEM *pItem = ListGetItemPtr(LIST_ROSTER, jid);
- // if (pItem)
- // RetrieveMessageArchive(event->hContact, pItem);
+ if (pItem && m_ThreadInfo && (m_ThreadInfo->jabberServerCaps & JABBER_CAPS_ARCHIVE_AUTO) && m_bEnableMsgArchive)
+ RetrieveMessageArchive(event->hContact, pItem);
}
}
else if (event->uType == MSG_WINDOW_EVT_CLOSING) {
|