Mercurial > pidgin
comparison src/protocols/novell/novell.c @ 9620:c001be3c330e
[gaim-migrate @ 10464]
Changes to those get_alias functions in blist.c from
Christopher (siege) O'Brien:
Renames gaim_get_buddy_alias to gaim_buddy_get_alias
Renames gaim_get_buddy_alias_only to
_gaim_buddy_get_alias_only
Adds function gaim_buddy_get_contact_alias, which looks
up a buddy's appropriate display name by order of:
buddy alias; contact alias; server alias; buddy name.
Note that the buddy alias is still the top-priority.
Changed conversation.c to use _get_contact_alias rather
than _get_alias
The end result of this is that aliasing the contact
will result in conversations with any of that contact's
buddies using the contact alias. This allows people
like myself to no longer have to alias each buddy to
the same alias in order to achieve the same effect.
committer: Tailor Script <tailor@pidgin.im>
author | Mark Doliner <mark@kingant.net> |
---|---|
date | Sat, 31 Jul 2004 21:29:40 +0000 |
parents | 8b2451878e26 |
children | 8ce2dc65e591 |
comparison
equal
deleted
inserted
replaced
9619:da88e2cd5c53 | 9620:c001be3c330e |
---|---|
264 | 264 |
265 /* Set the display id */ | 265 /* Set the display id */ |
266 gaim_blist_rename_buddy(buddy, | 266 gaim_blist_rename_buddy(buddy, |
267 nm_user_record_get_display_id(user_record)); | 267 nm_user_record_get_display_id(user_record)); |
268 | 268 |
269 alias = gaim_get_buddy_alias(buddy); | 269 alias = gaim_buddy_get_alias(buddy); |
270 if (alias == NULL || (strcmp(alias, buddy->name) == 0)) { | 270 if (alias == NULL || (strcmp(alias, buddy->name) == 0)) { |
271 gaim_blist_alias_buddy(buddy, | 271 gaim_blist_alias_buddy(buddy, |
272 nm_user_record_get_full_name(user_record)); | 272 nm_user_record_get_full_name(user_record)); |
273 | 273 |
274 /* Tell the server about the new display name */ | 274 /* Tell the server about the new display name */ |
2454 nm_contact_set_dn(contact, buddy->name); | 2454 nm_contact_set_dn(contact, buddy->name); |
2455 | 2455 |
2456 /* Remove the GaimBuddy (we will add it back after adding it | 2456 /* Remove the GaimBuddy (we will add it back after adding it |
2457 * to the server side list). Save the alias if there is one. | 2457 * to the server side list). Save the alias if there is one. |
2458 */ | 2458 */ |
2459 alias = gaim_get_buddy_alias(buddy); | 2459 alias = gaim_buddy_get_alias(buddy); |
2460 if (alias && strcmp(alias, buddy->name)) | 2460 if (alias && strcmp(alias, buddy->name)) |
2461 nm_contact_set_display_name(contact, alias); | 2461 nm_contact_set_display_name(contact, alias); |
2462 | 2462 |
2463 gaim_blist_remove_buddy(buddy); | 2463 gaim_blist_remove_buddy(buddy); |
2464 buddy = NULL; | 2464 buddy = NULL; |