diff -r 10445c2f584c -r 7d507b8b9f92 pidgin/gtklog.c --- a/pidgin/gtklog.c Wed Jul 10 01:23:11 2013 +0530 +++ b/pidgin/gtklog.c Wed Jul 10 01:42:28 2013 +0530 @@ -790,17 +790,16 @@ image = NULL; } - if (contact->alias != NULL) - name = contact->alias; - else if (contact->priority != NULL) - name = purple_buddy_get_contact_alias(contact->priority); + name = purple_contact_get_alias(contact); /* This will happen if the contact doesn't have an alias, * and none of the contact's buddies are online. * There is probably a better way to deal with this. */ if (name == NULL) { - if (contact->node.child != NULL && PURPLE_IS_BUDDY(contact->node.child)) - name = purple_buddy_get_contact_alias((PurpleBuddy *) contact->node.child); + if (PURPLE_BLIST_NODE(contact)->child != NULL && + PURPLE_IS_BUDDY(PURPLE_BLIST_NODE(contact)->child)) + name = purple_buddy_get_contact_alias(PURPLE_BUDDY( + PURPLE_BLIST_NODE(contact)->child)); if (name == NULL) name = ""; }