From 6810c23ee8e069c9156349638e1bad770854372e Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 26 Jun 2020 15:35:48 +0300 Subject: 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 --- protocols/JabberG/src/jabber_opt.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'protocols/JabberG/src/jabber_opt.cpp') diff --git a/protocols/JabberG/src/jabber_opt.cpp b/protocols/JabberG/src/jabber_opt.cpp index acc94be5fd..4a273b5168 100755 --- a/protocols/JabberG/src/jabber_opt.cpp +++ b/protocols/JabberG/src/jabber_opt.cpp @@ -782,6 +782,7 @@ public: m_otvOptions.AddOption(LPGENW("Messaging") L"/" LPGENW("Automatically save received notes"), m_proto->m_bAutosaveNotes); m_otvOptions.AddOption(LPGENW("Messaging") L"/" LPGENW("Inline pictures in messages (XEP-0231)"), m_proto->m_bInlinePictures); m_otvOptions.AddOption(LPGENW("Messaging") L"/" LPGENW("Enable chat states sending (XEP-0085)"), m_proto->m_bEnableChatStates); + m_otvOptions.AddOption(LPGENW("Messaging") L"/" LPGENW("Enable server-side history (XEP-0136)"), m_proto->m_bEnableMsgArchive); m_otvOptions.AddOption(LPGENW("Messaging") L"/" LPGENW("Enable carbon copies (XEP-0280)"), m_proto->m_bEnableCarbons); m_otvOptions.AddOption(LPGENW("Messaging") L"/" LPGENW("Use Stream Management (XEP-0198) if possible (Testing)"), m_proto->m_bEnableStreamMgmt); -- cgit v1.2.3