Mercurial > pidgin.yaz
comparison libpurple/protocols/jabber/presence.c @ 24427:39841a84c944
A fix from Paul Aurich for a long-standing XMPP issue with duplicate buddies. Fixes #479.
author | Daniel Atallah <daniel.atallah@gmail.com> |
---|---|
date | Fri, 21 Nov 2008 19:49:47 +0000 |
parents | 74960bf43dae |
children | 10ab5441572f 805aadbb1a85 6986ae0cbb51 adf153852bcf |
comparison
equal
deleted
inserted
replaced
24426:f387ded6f5ed | 24427:39841a84c944 |
---|---|
457 PurpleBuddy *buddy = purple_find_buddy(purple_connection_get_account(js->gc), from); | 457 PurpleBuddy *buddy = purple_find_buddy(purple_connection_get_account(js->gc), from); |
458 JabberBuddy *jb = NULL; | 458 JabberBuddy *jb = NULL; |
459 | 459 |
460 if (buddy) { | 460 if (buddy) { |
461 jb = jabber_buddy_find(js, from, TRUE); | 461 jb = jabber_buddy_find(js, from, TRUE); |
462 if ((jb->subscription & JABBER_SUB_TO)) | 462 if ((jb->subscription & (JABBER_SUB_TO | JABBER_SUB_PENDING))) |
463 onlist = TRUE; | 463 onlist = TRUE; |
464 } | 464 } |
465 | 465 |
466 jap->gc = js->gc; | 466 jap->gc = js->gc; |
467 jap->who = g_strdup(from); | 467 jap->who = g_strdup(from); |