comparison: pidgin/gtklog.c
pidgin/gtklog.c
- branch
- soc.2013.gobjectification
- changeset 34739
- 7d507b8b9f92
- parent 34728
- 8efd73063ecf
- child 34827
- 1615d90aa584
equal
deleted
inserted
replaced
| 34738:10445c2f584c | 34739:7d507b8b9f92 |
|---|---|
| 788 } else { | 788 } else { |
| 789 gtk_widget_destroy(image); | 789 gtk_widget_destroy(image); |
| 790 image = NULL; | 790 image = NULL; |
| 791 } | 791 } |
| 792 | 792 |
| 793 if (contact->alias != NULL) | 793 name = purple_contact_get_alias(contact); |
| 794 name = contact->alias; | |
| 795 else if (contact->priority != NULL) | |
| 796 name = purple_buddy_get_contact_alias(contact->priority); | |
| 797 | 794 |
| 798 /* This will happen if the contact doesn't have an alias, | 795 /* This will happen if the contact doesn't have an alias, |
| 799 * and none of the contact's buddies are online. | 796 * and none of the contact's buddies are online. |
| 800 * There is probably a better way to deal with this. */ | 797 * There is probably a better way to deal with this. */ |
| 801 if (name == NULL) { | 798 if (name == NULL) { |
| 802 if (contact->node.child != NULL && PURPLE_IS_BUDDY(contact->node.child)) | 799 if (PURPLE_BLIST_NODE(contact)->child != NULL && |
| 803 name = purple_buddy_get_contact_alias((PurpleBuddy *) contact->node.child); | 800 PURPLE_IS_BUDDY(PURPLE_BLIST_NODE(contact)->child)) |
| 801 name = purple_buddy_get_contact_alias(PURPLE_BUDDY( | |
| 802 PURPLE_BLIST_NODE(contact)->child)); | |
| 804 if (name == NULL) | 803 if (name == NULL) |
| 805 name = ""; | 804 name = ""; |
| 806 } | 805 } |
| 807 | 806 |
| 808 title = g_strdup_printf(_("Conversations with %s"), name); | 807 title = g_strdup_printf(_("Conversations with %s"), name); |
