From 5b9180012f495e23dfdd9fb7d91cfb1258734fe3 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Wed, 8 Jul 2020 18:39:15 +0300 Subject: group chat initialization to be done in protocol's constructor, not inside OnModulesLoaded --- protocols/JabberG/src/jabber_proto.cpp | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) (limited to 'protocols/JabberG') diff --git a/protocols/JabberG/src/jabber_proto.cpp b/protocols/JabberG/src/jabber_proto.cpp index 685f39eb14..27b02bbf34 100755 --- a/protocols/JabberG/src/jabber_proto.cpp +++ b/protocols/JabberG/src/jabber_proto.cpp @@ -209,6 +209,17 @@ CJabberProto::CJabberProto(const char *aProtoName, const wchar_t *aUserName) : OmemoInitDevice(); } + // group chats + GCREGISTER gcr = {}; + gcr.dwFlags = GC_TYPNOTIF | GC_CHANMGR; + gcr.ptszDispName = m_tszUserName; + gcr.pszModule = m_szModuleName; + Chat_Register(&gcr); + + HookProtoEvent(ME_GC_EVENT, &CJabberProto::JabberGcEventHook); + HookProtoEvent(ME_GC_BUILDMENU, &CJabberProto::JabberGcMenuHook); + + // resident settings db_set_resident(m_szModuleName, DBSETTING_XSTATUSID); db_set_resident(m_szModuleName, DBSETTING_XSTATUSNAME); db_set_resident(m_szModuleName, DBSETTING_XSTATUSMSG); @@ -274,15 +285,6 @@ void CJabberProto::OnModulesLoaded() ConsoleInit(); InitInfoFrame(); - GCREGISTER gcr = {}; - gcr.dwFlags = GC_TYPNOTIF | GC_CHANMGR; - gcr.ptszDispName = m_tszUserName; - gcr.pszModule = m_szModuleName; - Chat_Register(&gcr); - - HookProtoEvent(ME_GC_EVENT, &CJabberProto::JabberGcEventHook); - HookProtoEvent(ME_GC_BUILDMENU, &CJabberProto::JabberGcMenuHook); - StatusIconData sid = {}; sid.szModule = m_szModuleName; sid.hIcon = IcoLib_GetIconByHandle(m_hProtoIcon); -- cgit v1.2.3