From 68d275e75325e55d55090e7a996a73d5c2c546c3 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 19 Feb 2024 12:40:05 +0300 Subject: Jabber: all traces of VoIP finally removed from Jabber --- protocols/JabberG/src/jabber_opt.cpp | 2 -- protocols/JabberG/src/jabber_proto.cpp | 1 - protocols/JabberG/src/jabber_proto.h | 7 ------- 3 files changed, 10 deletions(-) diff --git a/protocols/JabberG/src/jabber_opt.cpp b/protocols/JabberG/src/jabber_opt.cpp index 5911b2a56c..ce2d3c4f6e 100644 --- a/protocols/JabberG/src/jabber_opt.cpp +++ b/protocols/JabberG/src/jabber_opt.cpp @@ -749,8 +749,6 @@ public: pOptions->AddOption(LPGENW("Messaging"), LPGENW("Enable carbon copies (XEP-0280)"), m_proto->m_bEnableCarbons); if (mir_strlen(ptrA(m_proto->getStringA("HttpUpload")))) pOptions->AddOption(LPGENW("Messaging"), LPGENW("Enable HTTP File Upload (XEP-0363)"), m_proto->m_bUseHttpUpload); - if (m_proto->FindFeature(JABBER_FEAT_JINGLE)) - pOptions->AddOption(LPGENW("Messaging"), LPGENW("Enable VOIP (experimental)"), m_proto->m_bEnableVOIP); pOptions->AddOption(LPGENW("Server options"), LPGENW("Use Stream Management (XEP-0198)"), m_proto->m_bEnableStreamMgmt); pOptions->AddOption(LPGENW("Server options"), LPGENW("Disable SASL authentication (for old servers)"), m_proto->m_bDisable3920auth); diff --git a/protocols/JabberG/src/jabber_proto.cpp b/protocols/JabberG/src/jabber_proto.cpp index 193ad5d92f..40dcd35e69 100644 --- a/protocols/JabberG/src/jabber_proto.cpp +++ b/protocols/JabberG/src/jabber_proto.cpp @@ -102,7 +102,6 @@ CJabberProto::CJabberProto(const char *aProtoName, const wchar_t *aUserName) : m_bEnableUserActivity(this, "EnableUserActivity", true), m_bEnableUserMood(this, "EnableUserMood", true), m_bEnableUserTune(this, "EnableUserTune", false), - m_bEnableVOIP(this, "EnableVOIP", false), m_bEnableZlib(this, "EnableZlib", true), m_bFixIncorrectTimestamps(this, "FixIncorrectTimestamps", true), m_bGcLogAffiliations(this, "GcLogAffiliations", false), diff --git a/protocols/JabberG/src/jabber_proto.h b/protocols/JabberG/src/jabber_proto.h index 3a982c1958..c87874ec20 100644 --- a/protocols/JabberG/src/jabber_proto.h +++ b/protocols/JabberG/src/jabber_proto.h @@ -206,7 +206,6 @@ struct CJabberProto : public PROTO, public IJabberInterface CMOption m_bEnableUserActivity; CMOption m_bEnableUserMood; CMOption m_bEnableUserTune; - CMOption m_bEnableVOIP; CMOption m_bEnableZlib; CMOption m_bFixIncorrectTimestamps; CMOption m_bGcLogAffiliations; @@ -903,12 +902,6 @@ struct CJabberProto : public PROTO, public IJabberInterface void AppendPhotoToVcard(TiXmlElement *n, bool bPhotoChanged, const wchar_t *szPhotoFileName, MCONTACT hContact = 0); void SetServerVcard(bool bPhotoChanged, wchar_t* szPhotoFileName); - //---- jabber_voip.c ----------------------------------------------------------------- - - __forceinline bool hasJingle() - { return FindFeature(JABBER_FEAT_JINGLE) != 0 && m_bEnableVOIP; - } - //---- jabber_xml.c ------------------------------------------------------------------ void OnConsoleProcessXml(const TiXmlElement *node, uint32_t flags); -- cgit v1.2.3