summaryrefslogtreecommitdiff
path: root/protocols/JabberG/src/jabber_proto.cpp
diff options
context:
space:
mode:
authorGluzskiy Alexandr <sss@sss.chaoslab.ru>2017-02-28 16:10:20 +0300
committerGluzskiy Alexandr <sss@sss.chaoslab.ru>2017-02-28 16:13:54 +0300
commitc91f19085e70f9e7fb2e8a445c87043f860f1f02 (patch)
tree814034e1df805ecb256be34d12ccfcc5c3235b8a /protocols/JabberG/src/jabber_proto.cpp
parent8736afe83f8c5aadf130542b2bbf14b2bcf57105 (diff)
jabber: fix caps ui bug introduced in early omemo implementation stage
omemo: basic device list event handler, added +notify cap to permanent caps, currenlty jabber have problems with dynamic caps...
Diffstat (limited to 'protocols/JabberG/src/jabber_proto.cpp')
-rwxr-xr-xprotocols/JabberG/src/jabber_proto.cpp15
1 files changed, 0 insertions, 15 deletions
diff --git a/protocols/JabberG/src/jabber_proto.cpp b/protocols/JabberG/src/jabber_proto.cpp
index 8c220e2a63..19813ac138 100755
--- a/protocols/JabberG/src/jabber_proto.cpp
+++ b/protocols/JabberG/src/jabber_proto.cpp
@@ -138,22 +138,7 @@ CJabberProto::CJabberProto(const char *aProtoName, const wchar_t *aUserName) :
m_pepServices.insert(new CPepActivity(this));
if (m_options.UseOMEMO)
- {
- JabberCapsBits jcb = 0;
- // set all bits occupied by g_JabberFeatCapPairs
- for (int i = 0; g_JabberFeatCapPairs[i].szFeature; i++)
- jcb |= g_JabberFeatCapPairs[i].jcbCap;
-
- // set all bits already occupied by external plugins
- for (int i = 0; i < m_lstJabberFeatCapPairsDynamic.getCount(); i++)
- jcb |= m_lstJabberFeatCapPairsDynamic[i]->jcbCap;
-
- jcb |= JABBER_CAPS_OMEMO_NOTIFY;
-
- m_clientCapsManager.SetClientCaps(JABBER_CAPS_MIRANDA_NODE, szCoreVersion, jcb);
-
OmemoInitDevice();
- }
db_set_resident(m_szModuleName, DBSETTING_XSTATUSID);
db_set_resident(m_szModuleName, DBSETTING_XSTATUSNAME);