comparison: src/list.c
src/list.c
- changeset 4227
- 5f98b16ed21c
- parent 3717
- 2fc0789e04e8
- child 4349
- a65175463a31
equal
deleted
inserted
replaced
| 4226:d6cf18debdfa | 4227:5f98b16ed21c |
|---|---|
| 137 good = gc->prpl->normalize(buddy); | 137 good = gc->prpl->normalize(buddy); |
| 138 else | 138 else |
| 139 good = buddy; | 139 good = buddy; |
| 140 | 140 |
| 141 g_snprintf(b->name, sizeof(b->name), "%s", good); | 141 g_snprintf(b->name, sizeof(b->name), "%s", good); |
| 142 g_snprintf(b->show, sizeof(b->show), "%s", show ? (show[0] ? show : good) : good); | 142 if(show && show[0]) |
| 143 g_snprintf(b->alias, sizeof(b->alias), "%s", show); | |
| 144 else | |
| 145 b->alias[0] = '\0'; | |
| 143 | 146 |
| 144 g->members = g_slist_append(g->members, b); | 147 g->members = g_slist_append(g->members, b); |
| 145 | 148 |
| 146 b->idle = 0; | 149 b->idle = 0; |
| 147 b->caps = 0; | 150 b->caps = 0; |
| 474 pos += g_snprintf(&s[pos], len - pos, "g %s\n", g->name); | 477 pos += g_snprintf(&s[pos], len - pos, "g %s\n", g->name); |
| 475 mem = g->members; | 478 mem = g->members; |
| 476 while (len > pos && mem) { | 479 while (len > pos && mem) { |
| 477 b = (struct buddy *)mem->data; | 480 b = (struct buddy *)mem->data; |
| 478 pos += g_snprintf(&s[pos], len - pos, "b %s%s%s\n", b->name, | 481 pos += g_snprintf(&s[pos], len - pos, "b %s%s%s\n", b->name, |
| 479 (show && strcmp(b->name, b->show)) ? ":" : "", | 482 (show && b->alias[0]) ? ":" : "", |
| 480 (show && strcmp(b->name, b->show)) ? b->show : ""); | 483 (show && b->alias[0]) ? b->alias : ""); |
| 481 mem = mem->next; | 484 mem = mem->next; |
| 482 } | 485 } |
| 483 grp = g_slist_next(grp); | 486 grp = g_slist_next(grp); |
| 484 } | 487 } |
| 485 | 488 |
| 870 m = m->next; | 873 m = m->next; |
| 871 } | 874 } |
| 872 g = g->next; | 875 g = g->next; |
| 873 } | 876 } |
| 874 } | 877 } |
| 878 | |
| 879 char *get_buddy_alias_only(struct buddy *b) { | |
| 880 if(!b) | |
| 881 return NULL; | |
| 882 if(b->alias[0]) | |
| 883 return b->alias; | |
| 884 else if((misc_options & OPT_MISC_USE_SERVER_ALIAS) && b->server_alias[0]) | |
| 885 return b->server_alias; | |
| 886 return NULL; | |
| 887 } | |
| 888 | |
| 889 | |
| 890 char *get_buddy_alias(struct buddy *b) { | |
| 891 char *ret = get_buddy_alias_only(b); | |
| 892 if(!ret) | |
| 893 return b ? b->name : _("Unknown"); | |
| 894 return ret; | |
| 895 } | |
| 896 |
