comparison: pidgin/gtkblist.c
pidgin/gtkblist.c
- changeset 19375
- 96de09c01b53
- parent 19361
- f36db8dce555
- child 19382
- f90e0b0b8b0e
- child 19422
- 30c77768cc4d
- child 19543
- d79b0822afc7
equal
deleted
inserted
replaced
| 19372:9463e376e5d4 | 19375:96de09c01b53 |
|---|---|
| 3322 hidden_conv = TRUE; | 3322 hidden_conv = TRUE; |
| 3323 } | 3323 } |
| 3324 } | 3324 } |
| 3325 | 3325 |
| 3326 /* XXX Good luck cleaning up this crap */ | 3326 /* XXX Good luck cleaning up this crap */ |
| 3327 if (aliased) { | 3327 contact = (PurpleContact*)((PurpleBlistNode*)b)->parent; |
| 3328 contact = (PurpleContact*)((PurpleBlistNode*)b)->parent; | 3328 if(contact) |
| 3329 if(contact) | 3329 gtkcontactnode = ((PurpleBlistNode*)contact)->ui_data; |
| 3330 gtkcontactnode = ((PurpleBlistNode*)contact)->ui_data; | 3330 |
| 3331 | 3331 if(gtkcontactnode && !gtkcontactnode->contact_expanded && contact->alias) |
| 3332 if(gtkcontactnode && !gtkcontactnode->contact_expanded && contact->alias) | 3332 name = contact->alias; |
| 3333 name = contact->alias; | 3333 else |
| 3334 else | 3334 name = purple_buddy_get_alias(b); |
| 3335 name = purple_buddy_get_alias(b); | |
| 3336 } else { | |
| 3337 name = b->name; | |
| 3338 } | |
| 3339 | 3335 |
| 3340 esc = g_markup_escape_text(name, strlen(name)); | 3336 esc = g_markup_escape_text(name, strlen(name)); |
| 3341 | 3337 |
| 3342 presence = purple_buddy_get_presence(b); | 3338 presence = purple_buddy_get_presence(b); |
| 3343 | 3339 |
