diff options
| author | Gluzskiy Alexandr <sss@sss.chaoslab.ru> | 2018-03-26 22:29:24 +0300 |
|---|---|---|
| committer | Gluzskiy Alexandr <sss@sss.chaoslab.ru> | 2018-03-26 22:29:24 +0300 |
| commit | ca32f2d04c953bacd17658911aa976eb89c6505a (patch) | |
| tree | a52d7b9f59d6752b305e8d52dae48da0745866b9 | |
| parent | 46e00e558a8a1633bbc85ccb70ec882982672927 (diff) | |
protocols: jabber: omemo
- check for empty GetPartialCaps ( fixes #1215 )
- more apropriate option description reflecting current status
| -rwxr-xr-x | protocols/JabberG/src/jabber_caps.cpp | 15 | ||||
| -rwxr-xr-x | protocols/JabberG/src/jabber_opt.cpp | 2 |
2 files changed, 10 insertions, 7 deletions
diff --git a/protocols/JabberG/src/jabber_caps.cpp b/protocols/JabberG/src/jabber_caps.cpp index 32668d2d25..d2bb4755bb 100755 --- a/protocols/JabberG/src/jabber_caps.cpp +++ b/protocols/JabberG/src/jabber_caps.cpp @@ -628,13 +628,16 @@ LBL_All: << XCHILD(L"value", L"urn:xmpp:dataforms:softwareinfo");
CJabberClientPartialCaps *pCaps = GetPartialCaps(JABBER_CAPS_MIRANDA_NODE, m_szFeaturesCrc);
- if (ppro->m_bShowOSVersion) {
- form << XCHILD(L"field") << XATTR(L"var", L"os") << XCHILD(L"value", pCaps->GetOs());
- form << XCHILD(L"field") << XATTR(L"var", L"os_version") << XCHILD(L"value", pCaps->GetOsVer());
+ if (pCaps)
+ {
+ if (ppro->m_bShowOSVersion) {
+ form << XCHILD(L"field") << XATTR(L"var", L"os") << XCHILD(L"value", pCaps->GetOs());
+ form << XCHILD(L"field") << XATTR(L"var", L"os_version") << XCHILD(L"value", pCaps->GetOsVer());
+ }
+ form << XCHILD(L"field") << XATTR(L"var", L"software") << XCHILD(L"value", pCaps->GetSoft());
+ form << XCHILD(L"field") << XATTR(L"var", L"software_version") << XCHILD(L"value", pCaps->GetSoftVer());
+ form << XCHILD(L"field") << XATTR(L"var", L"x-miranda-core-version") << XCHILD(L"value", pCaps->GetSoftMir());
}
- form << XCHILD(L"field") << XATTR(L"var", L"software") << XCHILD(L"value", pCaps->GetSoft());
- form << XCHILD(L"field") << XATTR(L"var", L"software_version") << XCHILD(L"value", pCaps->GetSoftVer());
- form << XCHILD(L"field") << XATTR(L"var", L"x-miranda-core-version") << XCHILD(L"value", pCaps->GetSoftMir());
}
ppro->m_ThreadInfo->send(iq);
diff --git a/protocols/JabberG/src/jabber_opt.cpp b/protocols/JabberG/src/jabber_opt.cpp index a60760fdce..0499a5f1d0 100755 --- a/protocols/JabberG/src/jabber_opt.cpp +++ b/protocols/JabberG/src/jabber_opt.cpp @@ -813,7 +813,7 @@ public: m_otvOptions.AddOption(LPGENW("Security") L"/" LPGENW("Show information about operating system in version replies"), m_proto->m_bShowOSVersion);
m_otvOptions.AddOption(LPGENW("Security") L"/" LPGENW("Accept only in band incoming filetransfers (don't disclose own IP)"), m_proto->m_bBsOnlyIBB);
m_otvOptions.AddOption(LPGENW("Security") L"/" LPGENW("Accept HTTP Authentication requests (XEP-0070)"), m_proto->m_bAcceptHttpAuth);
- m_otvOptions.AddOption(LPGENW("Security") L"/" LPGENW("Use OMEMO encryption for messages if possible (Experimental! WIP!)"), m_proto->m_bUseOMEMO);
+ m_otvOptions.AddOption(LPGENW("Security") L"/" LPGENW("Use OMEMO encryption for messages if possible (Basic support, no gui)"), m_proto->m_bUseOMEMO);
}
void OnInitDialog()
|