diff options
| author | George Hazan <george.hazan@gmail.com> | 2023-07-06 15:59:51 +0300 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2023-07-06 15:59:51 +0300 |
| commit | e8c7a91a247a09f4e4035641c697c9f51ba9f17c (patch) | |
| tree | c53c0c96e57130bd98df2fe6a0e3b51423df728e | |
| parent | 893a6939a7f4c8cece773c817505821225808c81 (diff) | |
Jabber: fix for Jingle options
| -rw-r--r-- | protocols/JabberG/src/jabber_opt.cpp | 2 | ||||
| -rw-r--r-- | protocols/JabberG/src/jabber_proto.h | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/protocols/JabberG/src/jabber_opt.cpp b/protocols/JabberG/src/jabber_opt.cpp index b0bc6d6342..c49f75ba7a 100644 --- a/protocols/JabberG/src/jabber_opt.cpp +++ b/protocols/JabberG/src/jabber_opt.cpp @@ -707,7 +707,7 @@ public: m_options.AddOption(LPGENW("Messaging"), LPGENW("Enable carbon copies (XEP-0280)"), m_proto->m_bEnableCarbons);
if (mir_strlen(ptrA(m_proto->getStringA("HttpUpload"))))
m_options.AddOption(LPGENW("Messaging"), LPGENW("Enable HTTP File Upload (XEP-0363)"), m_proto->m_bUseHttpUpload);
- if (m_proto->hasJingle())
+ if (m_proto->FindFeature(JABBER_FEAT_JINGLE))
m_options.AddOption(LPGENW("Messaging"), LPGENW("Enable VOIP (experimental)"), m_proto->m_bEnableVOIP);
m_options.AddOption(LPGENW("Server options"), LPGENW("Use Stream Management (XEP-0198) if possible (experimental)"), m_proto->m_bEnableStreamMgmt);
diff --git a/protocols/JabberG/src/jabber_proto.h b/protocols/JabberG/src/jabber_proto.h index b5a882df24..10c6e87feb 100644 --- a/protocols/JabberG/src/jabber_proto.h +++ b/protocols/JabberG/src/jabber_proto.h @@ -422,7 +422,6 @@ struct CJabberProto : public PROTO<CJabberProto>, public IJabberInterface int ByteSendProxyParse(HNETLIBCONN hConn, JABBER_BYTE_TRANSFER *jbt, char* buffer, int datalen);
//---- jabber_caps.cpp ---------------------------------------------------------------
- OBJLIST<JabberFeatCapPairDynamic> m_lstJabberFeatCapPairsDynamic; // list of features registered through IJabberNetInterface::RegisterFeature()
JabberCapsBits m_uEnabledFeatCapsDynamic;
CMStringA m_szFeaturesCrc;
@@ -438,6 +437,10 @@ struct CJabberProto : public PROTO<CJabberProto>, public IJabberInterface LIST<char> GetSortedFeatStrings(JabberCapsBits jcb);
JabberCapsBits GetOwnCaps(bool IncludeDynamic = true);
+ // dynamic list of features registered through IJabberNetInterface::RegisterFeature()
+ OBJLIST<JabberFeatCapPairDynamic> m_lstJabberFeatCapPairsDynamic;
+ JabberFeatCapPairDynamic *FindFeature(const char *szFeature);
+
//---- jabber_captcha.cpp ------------------------------------------------------------
void sendCaptchaResult(char* buf, ThreadData *info, const char *from, const char *challenge, const char *fromjid, const char *sid);
@@ -968,8 +971,6 @@ private: int m_nMenuResourceItems;
HGENMENU* m_phMenuResourceItems;
- JabberFeatCapPairDynamic* FindFeature(const char *szFeature);
-
public:
uint32_t STDMETHODCALLTYPE GetFlags() const override; // Set of JIF_* flags.
int STDMETHODCALLTYPE GetVersion() const override; // Returns version of IJabberInterface.
|