From 92b173c3a8553b59077aa2757c9627cb4c73d29e Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 20 Jan 2017 00:11:36 +0300 Subject: Chat_NewSession to return a pointer to a newly created session, not to dig it anymore --- protocols/JabberG/src/jabber_chat.cpp | 4 +--- protocols/JabberG/src/jabber_proto.cpp | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'protocols/JabberG/src') diff --git a/protocols/JabberG/src/jabber_chat.cpp b/protocols/JabberG/src/jabber_chat.cpp index 426fcd98fc..bc5d850268 100644 --- a/protocols/JabberG/src/jabber_chat.cpp +++ b/protocols/JabberG/src/jabber_chat.cpp @@ -127,9 +127,7 @@ int CJabberProto::GcInit(JABBER_LIST_ITEM *item) sttRoleItems[i].translate(); ptrW szNick(JabberNickFromJID(item->jid)); - Chat_NewSession(GCW_CHATROOM, m_szModuleName, item->jid, szNick); - - GCSessionInfoBase *si = pci->SM_FindSession(item->jid, m_szModuleName); + GCSessionInfoBase *si = Chat_NewSession(GCW_CHATROOM, m_szModuleName, item->jid, szNick); if (si != NULL) { item->hContact = si->hContact; diff --git a/protocols/JabberG/src/jabber_proto.cpp b/protocols/JabberG/src/jabber_proto.cpp index be0bbb6e50..6d46ddb8a1 100755 --- a/protocols/JabberG/src/jabber_proto.cpp +++ b/protocols/JabberG/src/jabber_proto.cpp @@ -219,7 +219,7 @@ int CJabberProto::OnModulesLoadedEx(WPARAM, LPARAM) GCREGISTER gcr = {}; gcr.dwFlags = GC_TYPNOTIF | GC_CHANMGR; - gcr.nColors = 16; + gcr.nColors = _countof(crCols); gcr.pColors = &crCols[0]; gcr.ptszDispName = m_tszUserName; gcr.pszModule = m_szModuleName; -- cgit v1.2.3