diff options
| author | George Hazan <ghazan@miranda.im> | 2022-10-31 12:00:07 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2022-10-31 12:00:07 +0300 |
| commit | 6fc8beb2129b3209c7fcd464ef812b765429c7fa (patch) | |
| tree | 75186f7a1b3c58b19177b90c060e9ac1540a4977 /protocols | |
| parent | 3217d7889f3db73e145e74c60710440c34a83b7a (diff) | |
fixes #3211 completely
Diffstat (limited to 'protocols')
| -rw-r--r-- | protocols/JabberG/src/jabber_chat.cpp | 2 | ||||
| -rw-r--r-- | protocols/JabberG/src/jabber_thread.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/protocols/JabberG/src/jabber_chat.cpp b/protocols/JabberG/src/jabber_chat.cpp index 627b6668a8..0e181acac6 100644 --- a/protocols/JabberG/src/jabber_chat.cpp +++ b/protocols/JabberG/src/jabber_chat.cpp @@ -153,8 +153,6 @@ int CJabberProto::GcInit(JABBER_LIST_ITEM *item) for (int i = _countof(sttStatuses) - 1; i >= 0; i--)
Chat_AddGroup(si, TranslateW(Utf2T(sttStatuses[i])));
- Chat_Control(m_szModuleName, wszJid, (item->bAutoJoin && m_bAutoJoinHidden) ? WINDOW_HIDDEN : SESSION_INITDONE);
-
time_t lastDate = getDword(si->hContact, "LastGetVcard"), now = time(0);
if (now - lastDate > 24 * 60 * 60) {
SendGetVcard(si->hContact);
diff --git a/protocols/JabberG/src/jabber_thread.cpp b/protocols/JabberG/src/jabber_thread.cpp index f45e313e05..d234e46dac 100644 --- a/protocols/JabberG/src/jabber_thread.cpp +++ b/protocols/JabberG/src/jabber_thread.cpp @@ -157,7 +157,9 @@ void CJabberProto::CheckKeepAlive() if (auto *item = ListGetItemPtrFromIndex(i)) {
if (!item->bChatLogging && now - item->iChatInitTime > 2) {
item->bChatLogging = true;
- Chat_Control(m_szModuleName, Utf2T(item->jid), SESSION_ONLINE);
+ Utf2T wszJid(item->jid);
+ Chat_Control(m_szModuleName, wszJid, (item->bAutoJoin && m_bAutoJoinHidden) ? WINDOW_HIDDEN : SESSION_INITDONE);
+ Chat_Control(m_szModuleName, wszJid, SESSION_ONLINE);
}
}
}
|