diff options
| author | George Hazan <george.hazan@gmail.com> | 2013-07-20 10:51:35 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2013-07-20 10:51:35 +0000 |
| commit | 2fe00cdd66d4559cc43a5f27c19ddc79a43676eb (patch) | |
| tree | 546def30affbabeaad425c9a25e2545e1e4096f5 /protocols/JabberG/src/jabber_thread.cpp | |
| parent | f946ebcb1ac09b7220f8547074496aa2d1b83768 (diff) | |
- all manual list locks removed;
- ListExists removed and replaced with ListGetItemPtr;
- code cleaning
git-svn-id: http://svn.miranda-ng.org/main/trunk@5426 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/JabberG/src/jabber_thread.cpp')
| -rw-r--r-- | protocols/JabberG/src/jabber_thread.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/protocols/JabberG/src/jabber_thread.cpp b/protocols/JabberG/src/jabber_thread.cpp index a37074a14c..d16a5a1f15 100644 --- a/protocols/JabberG/src/jabber_thread.cpp +++ b/protocols/JabberG/src/jabber_thread.cpp @@ -1609,7 +1609,7 @@ void CJabberProto::OnProcessPresence(HXML node, ThreadData* info) if (m_presenceManager.HandlePresencePermanent(node, info))
return;
- if (ListExist(LIST_CHATROOM, from)) {
+ if (ListGetItemPtr(LIST_CHATROOM, from)) {
GroupchatProcessPresence(node);
return;
}
@@ -1629,14 +1629,14 @@ void CJabberProto::OnProcessPresence(HXML node, ThreadData* info) return;
if ((hContact = HContactFromJID(from)) == NULL) {
- if ( !_tcsicmp(info->fullJID, from) || (!bSelfPresence && !ListExist(LIST_ROSTER, from))) {
+ if ( !_tcsicmp(info->fullJID, from) || (!bSelfPresence && !ListGetItemPtr(LIST_ROSTER, from))) {
Log("SKIP Receive presence online from %S (who is not in my roster and not in list - skiping)", from);
mir_free(nick);
return;
}
hContact = DBCreateContact(from, nick, TRUE, TRUE);
}
- if ( !ListExist(LIST_ROSTER, from)) {
+ if ( !ListGetItemPtr(LIST_ROSTER, from)) {
Log("Receive presence online from %S (who is not in my roster)", from);
ListAdd(LIST_ROSTER, from);
}
|