From 8d0243815302f0f0e4ac2f2a6df5f811c875c545 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sat, 3 Jan 2015 23:10:47 +0000 Subject: fix not to retrieve jabber avatar if it's not needed git-svn-id: http://svn.miranda-ng.org/main/trunk@11761 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/JabberG/src/jabber_thread.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/protocols/JabberG/src/jabber_thread.cpp b/protocols/JabberG/src/jabber_thread.cpp index 2236c8aca8..99b76a4250 100644 --- a/protocols/JabberG/src/jabber_thread.cpp +++ b/protocols/JabberG/src/jabber_thread.cpp @@ -1568,7 +1568,7 @@ void CJabberProto::OnProcessPresence(HXML node, ThreadData *info) setTString(hContact, "AvatarHash", ptszHash); bHasAvatar = true; ptrT saved(getTStringA(hContact, "AvatarSaved")); - if (saved != NULL || mir_tstrcmp(saved, ptszHash)) { + if (saved == NULL || mir_tstrcmp(saved, ptszHash)) { debugLogA("Avatar was changed"); ProtoBroadcastAck(hContact, ACKTYPE_AVATAR, ACKRESULT_STATUS, NULL, NULL); } @@ -1588,7 +1588,7 @@ void CJabberProto::OnProcessPresence(HXML node, ThreadData *info) setTString(hContact, "AvatarHash", txt); bHasAvatar = true; ptrT saved(getTStringA(hContact, "AvatarSaved")); - if (saved || mir_tstrcmp(saved, txt)) { + if (saved == NULL || mir_tstrcmp(saved, txt)) { debugLogA("Avatar was changed. Using vcard-temp:x:update"); ProtoBroadcastAck(hContact, ACKTYPE_AVATAR, ACKRESULT_STATUS, NULL, NULL); } -- cgit v1.2.3