Mercurial > pidgin.yaz
comparison pidgin/gtkblist.c @ 28272:968ec034a958
merged with im.pidgin.pidgin
author | Yoshiki Yazawa <yaz@honeyplanet.jp> |
---|---|
date | Sun, 16 Aug 2009 23:02:17 +0900 |
parents | 5ac0a83f0b21 6b05a0e36ffb |
children | dfd8d82313be |
comparison
equal
deleted
inserted
replaced
28262:90d108cda54e | 28272:968ec034a958 |
---|---|
625 { | 625 { |
626 PurpleContact *contact = PURPLE_CONTACT(node); | 626 PurpleContact *contact = PURPLE_CONTACT(node); |
627 struct _pidgin_blist_node *gtknode = | 627 struct _pidgin_blist_node *gtknode = |
628 (struct _pidgin_blist_node *)purple_blist_node_get_ui_data(node); | 628 (struct _pidgin_blist_node *)purple_blist_node_get_ui_data(node); |
629 | 629 |
630 if (purple_contact_get_alias(contact) || gtknode->contact_expanded) { | 630 /* |
631 * XXX Using purple_contact_get_alias here breaks because we | |
632 * specifically want to check the contact alias only (i.e. not | |
633 * the priority buddy, which purple_contact_get_alias does). | |
634 * Adding yet another get_alias is evil, so figure this out | |
635 * later :-P | |
636 */ | |
637 if (contact->alias || gtknode->contact_expanded) { | |
631 purple_blist_alias_contact(contact, arg2); | 638 purple_blist_alias_contact(contact, arg2); |
632 gtk_blist_auto_personize(purple_blist_node_get_parent(node), arg2); | 639 gtk_blist_auto_personize(purple_blist_node_get_parent(node), arg2); |
633 } else { | 640 } else { |
634 PurpleBuddy *buddy = purple_contact_get_priority_buddy(contact); | 641 PurpleBuddy *buddy = purple_contact_get_priority_buddy(contact); |
635 purple_blist_alias_buddy(buddy, arg2); | 642 purple_blist_alias_buddy(buddy, arg2); |