comparison pidgin/gtkblist.c @ 28266:6b05a0e36ffb

Fix setting the alias on a metacontact when it's not expanded. This is a patch.
author Paul Aurich <paul@darkrain42.org>
date Sun, 16 Aug 2009 03:23:54 +0000
parents deecc1d663c4
children 968ec034a958 870015b978c9
comparison
equal deleted inserted replaced
28265:0db08d748475 28266:6b05a0e36ffb
620 { 620 {
621 PurpleContact *contact = PURPLE_CONTACT(node); 621 PurpleContact *contact = PURPLE_CONTACT(node);
622 struct _pidgin_blist_node *gtknode = 622 struct _pidgin_blist_node *gtknode =
623 (struct _pidgin_blist_node *)purple_blist_node_get_ui_data(node); 623 (struct _pidgin_blist_node *)purple_blist_node_get_ui_data(node);
624 624
625 if (purple_contact_get_alias(contact) || gtknode->contact_expanded) { 625 /*
626 * XXX Using purple_contact_get_alias here breaks because we
627 * specifically want to check the contact alias only (i.e. not
628 * the priority buddy, which purple_contact_get_alias does).
629 * Adding yet another get_alias is evil, so figure this out
630 * later :-P
631 */
632 if (contact->alias || gtknode->contact_expanded) {
626 purple_blist_alias_contact(contact, arg2); 633 purple_blist_alias_contact(contact, arg2);
627 gtk_blist_auto_personize(purple_blist_node_get_parent(node), arg2); 634 gtk_blist_auto_personize(purple_blist_node_get_parent(node), arg2);
628 } else { 635 } else {
629 PurpleBuddy *buddy = purple_contact_get_priority_buddy(contact); 636 PurpleBuddy *buddy = purple_contact_get_priority_buddy(contact);
630 purple_blist_alias_buddy(buddy, arg2); 637 purple_blist_alias_buddy(buddy, arg2);