summaryrefslogtreecommitdiff
path: root/protocols/Sametime/src
diff options
context:
space:
mode:
authorGeorge Hazan <ghazan@miranda.im>2020-07-08 18:39:15 +0300
committerGeorge Hazan <ghazan@miranda.im>2020-07-08 18:39:15 +0300
commit5b9180012f495e23dfdd9fb7d91cfb1258734fe3 (patch)
treeb80652f253cefb1b807d9aac04ad8e9a4676518e /protocols/Sametime/src
parentf365c11384642f6674ff5019ff97eda6f89ba378 (diff)
group chat initialization to be done in protocol's constructor, not inside OnModulesLoaded
Diffstat (limited to 'protocols/Sametime/src')
-rw-r--r--protocols/Sametime/src/sametime.cpp13
-rw-r--r--protocols/Sametime/src/sametime_proto.cpp7
-rw-r--r--protocols/Sametime/src/sametime_proto.h1
3 files changed, 8 insertions, 13 deletions
diff --git a/protocols/Sametime/src/sametime.cpp b/protocols/Sametime/src/sametime.cpp
index 186ebcda7f..fb84cb050a 100644
--- a/protocols/Sametime/src/sametime.cpp
+++ b/protocols/Sametime/src/sametime.cpp
@@ -69,8 +69,7 @@ INT_PTR CSametimeProto::SametimeLoadIcon(WPARAM wParam, LPARAM lParam)
GetSystemMetrics(wParam & PLIF_SMALL ? SM_CYSMICON : SM_CYICON), 0);
}
-
-//icolib stuff
+// icolib stuff
static IconItem iconList[] =
{
{ LPGEN("Protocol icon"), "protoicon", IDI_ICON_PROTO, 0 },
@@ -123,16 +122,6 @@ int CSametimeProto::OnIdleChanged(WPARAM, LPARAM lParam)
return 0;
}
-void CSametimeProto::OnModulesLoaded()
-{
- // register with chat module
- GCREGISTER gcr = {};
- gcr.pszModule = m_szModuleName;
- gcr.ptszDispName = m_tszUserName;
- gcr.iMaxText = MAX_MESSAGE_SIZE;
- Chat_Register(&gcr);
-}
-
void CSametimeProto::OnShutdown()
{
if (m_iStatus != ID_STATUS_OFFLINE)
diff --git a/protocols/Sametime/src/sametime_proto.cpp b/protocols/Sametime/src/sametime_proto.cpp
index 7f583c3e1d..594c9d9874 100644
--- a/protocols/Sametime/src/sametime_proto.cpp
+++ b/protocols/Sametime/src/sametime_proto.cpp
@@ -55,6 +55,13 @@ CSametimeProto::CSametimeProto(const char* pszProtoName, const wchar_t* tszUserN
LoadOptions();
+ // register with chat module
+ GCREGISTER gcr = {};
+ gcr.pszModule = m_szModuleName;
+ gcr.ptszDispName = m_tszUserName;
+ gcr.iMaxText = MAX_MESSAGE_SIZE;
+ Chat_Register(&gcr);
+
debugLogW(L"CSametimeProto::CSametimeProto() end");
}
diff --git a/protocols/Sametime/src/sametime_proto.h b/protocols/Sametime/src/sametime_proto.h
index b97a53c40f..2f1cf45750 100644
--- a/protocols/Sametime/src/sametime_proto.h
+++ b/protocols/Sametime/src/sametime_proto.h
@@ -38,7 +38,6 @@ struct CSametimeProto : public PROTO<CSametimeProto>
int UserIsTyping(MCONTACT hContact, int type) override;
- void OnModulesLoaded() override;
void OnShutdown() override;
// sametime.cpp