From 5756772ef9e9fd5b4a730d8a16737996cbec55f5 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sat, 20 Jul 2013 20:30:07 +0000 Subject: less cycles, simplier code git-svn-id: http://svn.miranda-ng.org/main/trunk@5434 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/JabberG/src/jabber_thread.cpp | 12 ++++-------- 1 file changed, 4 insertions(+), 8 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 f030609074..01d13405db 100644 --- a/protocols/JabberG/src/jabber_thread.cpp +++ b/protocols/JabberG/src/jabber_thread.cpp @@ -1098,12 +1098,9 @@ HANDLE CJabberProto::CreateTemporaryContact(const TCHAR *szJid, JABBER_LIST_ITEM p = szJid; hContact = DBCreateContact(szJid, p, TRUE, FALSE); - for (int i=0; i < chatItem->resourceCount; i++) { - if ( !lstrcmp(chatItem->pResources[i].resourceName, p)) { - setWord(hContact, "Status", chatItem->pResources[i].status); - break; - } - } + JABBER_RESOURCE_STATUS *r = chatItem->findResource(p); + if (r) + setWord(hContact, "Status", r->status); } else { TCHAR *nick = JabberNickFromJID(szJid); @@ -1544,8 +1541,7 @@ void CJabberProto::UpdateJidDbSettings(const TCHAR *jid) // Determine status to show for the contact based on the remaining resources int nSelectedResource = -1, i = 0; int nMaxPriority = -999; // -128...+127 valid range - for (i = 0; i < item->resourceCount; i++) - { + for (i = 0; i < item->resourceCount; i++) { if (item->pResources[i].priority > nMaxPriority) { nMaxPriority = item->pResources[i].priority; status = item->pResources[i].status; -- cgit v1.2.3