summaryrefslogtreecommitdiff
path: root/protocols/JabberG/src/jabber_proto.cpp
diff options
context:
space:
mode:
authorGluzskiy Alexandr <sss@sss.chaoslab.ru>2017-02-23 06:01:21 +0300
committerGluzskiy Alexandr <sss@sss.chaoslab.ru>2017-02-23 06:01:21 +0300
commit81f96a9093d92678a9c78ed248ec966fd941a69c (patch)
treefb8f01771c92006669456842ae6c314e320ee16a /protocols/JabberG/src/jabber_proto.cpp
parentaffa00fc0e6eb69d36b6bdb66bbef468f9ed236a (diff)
libs:
libsignal-c: added few more missed exports protocol: jabber: omemo: implemented 4.1 (https://conversations.im/xeps/multi-end.html)
Diffstat (limited to 'protocols/JabberG/src/jabber_proto.cpp')
-rwxr-xr-xprotocols/JabberG/src/jabber_proto.cpp21
1 files changed, 12 insertions, 9 deletions
diff --git a/protocols/JabberG/src/jabber_proto.cpp b/protocols/JabberG/src/jabber_proto.cpp
index 6d46ddb8a1..8c220e2a63 100755
--- a/protocols/JabberG/src/jabber_proto.cpp
+++ b/protocols/JabberG/src/jabber_proto.cpp
@@ -127,6 +127,16 @@ CJabberProto::CJabberProto(const char *aProtoName, const wchar_t *aUserName) :
m_messageManager.FillPermanentHandlers();
m_adhocManager.FillDefaultNodes();
m_clientCapsManager.AddDefaultCaps();
+
+ IconsInit();
+ InitPopups();
+ GlobalMenuInit();
+ WsInit();
+ ConsoleInit();
+
+ m_pepServices.insert(new CPepMood(this));
+ m_pepServices.insert(new CPepActivity(this));
+
if (m_options.UseOMEMO)
{
JabberCapsBits jcb = 0;
@@ -141,16 +151,9 @@ CJabberProto::CJabberProto(const char *aProtoName, const wchar_t *aUserName) :
jcb |= JABBER_CAPS_OMEMO_NOTIFY;
m_clientCapsManager.SetClientCaps(JABBER_CAPS_MIRANDA_NODE, szCoreVersion, jcb);
- }
-
- IconsInit();
- InitPopups();
- GlobalMenuInit();
- WsInit();
- ConsoleInit();
- m_pepServices.insert(new CPepMood(this));
- m_pepServices.insert(new CPepActivity(this));
+ OmemoInitDevice();
+ }
db_set_resident(m_szModuleName, DBSETTING_XSTATUSID);
db_set_resident(m_szModuleName, DBSETTING_XSTATUSNAME);