diff options
| -rw-r--r-- | protocols/Discord/src/proto.cpp | 6 | ||||
| -rw-r--r-- | protocols/Steam/src/steam_events.cpp | 2 | ||||
| -rw-r--r-- | protocols/Steam/src/steam_proto.cpp | 1 | ||||
| -rw-r--r-- | protocols/Tox/src/tox_accounts.cpp | 2 | ||||
| -rw-r--r-- | protocols/Tox/src/tox_proto.cpp | 3 | ||||
| -rw-r--r-- | protocols/VKontakte/src/vk_proto.cpp | 4 |
6 files changed, 10 insertions, 8 deletions
diff --git a/protocols/Discord/src/proto.cpp b/protocols/Discord/src/proto.cpp index 5403f78955..6d899154dc 100644 --- a/protocols/Discord/src/proto.cpp +++ b/protocols/Discord/src/proto.cpp @@ -65,9 +65,6 @@ CDiscordProto::CDiscordProto(const char *proto_name, const wchar_t *username) : // database db_set_resident(m_szModuleName, "XStatusMsg"); - // Clist - Clist_GroupCreate(0, m_wszDefaultGroup); - // Fill users list for (auto &hContact : AccContacts()) { CDiscordUser *pNew = new CDiscordUser(getId(hContact, DB_KEY_ID)); @@ -579,6 +576,9 @@ int CDiscordProto::OnModulesLoaded(WPARAM, LPARAM) gcr.pszModule = m_szModuleName; Chat_Register(&gcr); + // Clist + Clist_GroupCreate(0, m_wszDefaultGroup); + HookProtoEvent(ME_GC_EVENT, &CDiscordProto::GroupchatEventHook); HookProtoEvent(ME_GC_BUILDMENU, &CDiscordProto::GroupchatMenuHook); diff --git a/protocols/Steam/src/steam_events.cpp b/protocols/Steam/src/steam_events.cpp index 9c37a9d74e..23a418f9e5 100644 --- a/protocols/Steam/src/steam_events.cpp +++ b/protocols/Steam/src/steam_events.cpp @@ -2,6 +2,8 @@ int CSteamProto::OnModulesLoaded(WPARAM, LPARAM) { + Clist_GroupCreate(0, m_defaultGroup); + HookProtoEvent(ME_OPT_INITIALISE, &CSteamProto::OnOptionsInit); HookProtoEvent(ME_IDLE_CHANGED, &CSteamProto::OnIdleChanged); HookProtoEvent(ME_MSG_PRECREATEEVENT, &CSteamProto::OnPreCreateMessage); diff --git a/protocols/Steam/src/steam_proto.cpp b/protocols/Steam/src/steam_proto.cpp index 2a3b1dd732..8a92e60534 100644 --- a/protocols/Steam/src/steam_proto.cpp +++ b/protocols/Steam/src/steam_proto.cpp @@ -16,7 +16,6 @@ CSteamProto::CSteamProto(const char* protoName, const wchar_t* userName) m_defaultGroup = getWStringA("DefaultGroup"); if (m_defaultGroup == nullptr) m_defaultGroup = mir_wstrdup(L"Steam"); - Clist_GroupCreate(0, m_defaultGroup); // icons wchar_t filePath[MAX_PATH]; diff --git a/protocols/Tox/src/tox_accounts.cpp b/protocols/Tox/src/tox_accounts.cpp index ad948974a8..d70d6bad54 100644 --- a/protocols/Tox/src/tox_accounts.cpp +++ b/protocols/Tox/src/tox_accounts.cpp @@ -32,6 +32,8 @@ CToxProto* CToxProto::GetContactAccount(MCONTACT hContact) int CToxProto::OnAccountLoaded(WPARAM, LPARAM)
{
+ Clist_GroupCreate(0, m_defaultGroup);
+
HookProtoEvent(ME_OPT_INITIALISE, &CToxProto::OnOptionsInit);
HookProtoEvent(ME_USERINFO_INITIALISE, &CToxProto::OnUserInfoInit);
HookProtoEvent(ME_MSG_PRECREATEEVENT, &CToxProto::OnPreCreateMessage);
diff --git a/protocols/Tox/src/tox_proto.cpp b/protocols/Tox/src/tox_proto.cpp index 4b0a8581a2..0de30278a4 100644 --- a/protocols/Tox/src/tox_proto.cpp +++ b/protocols/Tox/src/tox_proto.cpp @@ -12,8 +12,7 @@ CToxProto::CToxProto(const char* protoName, const wchar_t* userName) m_defaultGroup = getWStringA(TOX_SETTINGS_GROUP);
if (m_defaultGroup == nullptr)
m_defaultGroup = mir_wstrdup(L"Tox");
- Clist_GroupCreate(0, m_defaultGroup);
-
+
CreateProtoService(PS_CREATEACCMGRUI, &CToxProto::OnAccountManagerInit);
setAllContactStatuses(ID_STATUS_OFFLINE);
diff --git a/protocols/VKontakte/src/vk_proto.cpp b/protocols/VKontakte/src/vk_proto.cpp index 75084fe329..4d3505c327 100644 --- a/protocols/VKontakte/src/vk_proto.cpp +++ b/protocols/VKontakte/src/vk_proto.cpp @@ -70,8 +70,6 @@ CVkProto::CVkProto(const char *szModuleName, const wchar_t *pwszUserName) : nlu.szDescriptiveName.w = descr;
m_hNetlibUser = Netlib_RegisterUser(&nlu);
- Clist_GroupCreate(0, m_vkOptions.pwszDefaultGroup);
-
CMStringA szListeningTo(FORMAT, "%sEnabled", m_szModuleName);
db_set_b(0, "ListeningTo", szListeningTo, m_vkOptions.iMusicSendMetod == 0 ? 0 : 1);
@@ -105,6 +103,8 @@ CVkProto::~CVkProto() int CVkProto::OnModulesLoaded(WPARAM, LPARAM)
{
+ Clist_GroupCreate(0, m_vkOptions.pwszDefaultGroup);
+
// Chats
GCREGISTER gcr = {};
gcr.ptszDispName = m_tszUserName;
|