comparison libpurple/protocols/jabber/presence.c @ 29262:558baf33197e

propagate from branch 'im.pidgin.pidgin' (head 7399f80ea98924dbddd57be1e652ecbae89d3a8e) to branch 'im.pidgin.cpw.attention_ui' (head 59a01fefc852925a87d40736c747f639270c11be)
author Marcus Lundblad <ml@update.uu.se>
date Mon, 24 Nov 2008 22:13:44 +0000
parents 39841a84c944
children 10ab5441572f adf153852bcf 805aadbb1a85 6986ae0cbb51
comparison
equal deleted inserted replaced
29261:24aa608c5388 29262:558baf33197e
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);