From 83181e39a7613a9ed00c6c7ddcbea59a340d491e Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 23 Sep 2013 08:08:32 +0000 Subject: automatic allocator for a temp resource item git-svn-id: http://svn.miranda-ng.org/main/trunk@6192 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/JabberG/src/jabber_thread.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'protocols/JabberG/src/jabber_thread.cpp') diff --git a/protocols/JabberG/src/jabber_thread.cpp b/protocols/JabberG/src/jabber_thread.cpp index 420544d65c..d12bf6fcff 100644 --- a/protocols/JabberG/src/jabber_thread.cpp +++ b/protocols/JabberG/src/jabber_thread.cpp @@ -1517,9 +1517,9 @@ void CJabberProto::UpdateJidDbSettings(const TCHAR *jid) if ( !item->arResources.getCount()) { // set offline only if jid has resources if (_tcschr(jid, '/') == NULL) - status = item->m_pItemResource->m_iStatus; - if (item->m_pItemResource->m_tszStatusMessage) - db_set_ts(hContact, "CList", "StatusMsg", item->m_pItemResource->m_tszStatusMessage); + status = item->getTemp()->m_iStatus; + if (item->getTemp()->m_tszStatusMessage) + db_set_ts(hContact, "CList", "StatusMsg", item->getTemp()->m_tszStatusMessage); else db_unset(hContact, "CList", "StatusMsg"); } @@ -1539,7 +1539,7 @@ void CJabberProto::UpdateJidDbSettings(const TCHAR *jid) nSelectedResource = i; } } - item->m_pItemResource->m_iStatus = status; + item->getTemp()->m_iStatus = status; if (nSelectedResource != -1) { pResourceStatus r(item->arResources[nSelectedResource]); Log("JabberUpdateJidDbSettings: updating jid %S to rc %S", item->jid, r->m_tszResourceName); @@ -1708,8 +1708,8 @@ void CJabberProto::OnProcessPresence(HXML node, ThreadData* info) // set status only if no more available resources if ( !item->arResources.getCount()) { - item->m_pItemResource->m_iStatus = ID_STATUS_OFFLINE; - item->m_pItemResource->m_tszStatusMessage = mir_tstrdup(xmlGetText( xmlGetChild(node , "status"))); + item->getTemp()->m_iStatus = ID_STATUS_OFFLINE; + item->getTemp()->m_tszStatusMessage = mir_tstrdup(xmlGetText( xmlGetChild(node , "status"))); } } else Log("SKIP Receive presence offline from %S (who is not in my roster)", from); -- cgit v1.2.3