From 6f03a0bf158226db5e50e099786a09ba4894a393 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Thu, 21 Apr 2016 12:46:33 +0000 Subject: - fix for a chat room processing in roster; - fix for a default chat room's nick git-svn-id: http://svn.miranda-ng.org/main/trunk@16733 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/JabberG/src/jabber_proto.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'protocols/JabberG/src/jabber_proto.cpp') diff --git a/protocols/JabberG/src/jabber_proto.cpp b/protocols/JabberG/src/jabber_proto.cpp index 57025c09b5..67b6c4bd22 100644 --- a/protocols/JabberG/src/jabber_proto.cpp +++ b/protocols/JabberG/src/jabber_proto.cpp @@ -241,11 +241,18 @@ int CJabberProto::OnModulesLoadedEx(WPARAM, LPARAM) for (MCONTACT hContact = db_find_first(m_szModuleName); hContact; hContact = db_find_next(hContact, m_szModuleName)) { SetContactOfflineStatus(hContact); + if (isChatRoom(hContact)) { + ptrT jid(getTStringA(hContact, "ChatRoomID")); + if (jid != NULL) + ListAdd(LIST_CHATROOM, jid, hContact); + continue; + } + ptrT jid(getTStringA(hContact, "jid")); if (jid == NULL) continue; - ListAdd(isChatRoom(hContact) ? LIST_CHATROOM : LIST_ROSTER, jid, hContact); + ListAdd(LIST_ROSTER, jid, hContact); TCHAR *resourcepos = _tcschr(jid, '/'); if (resourcepos != NULL) -- cgit v1.2.3