diff options
| author | James Booth <boothj5@gmail.com> | 2016-08-13 17:19:24 +0100 |
|---|---|---|
| committer | James Booth <boothj5@gmail.com> | 2016-08-13 17:19:24 +0100 |
| commit | 0bd5b5200af5628ed6d841139c44cf3dabee8e3e (patch) | |
| tree | 8fb017e6af97d4ce1fd72c83705b0d559e579b15 /src/ui/window.c | |
| parent | 80eb5bee90b6af97b2e5d14c8d4aa5cc924a1a9d (diff) | |
| download | profani-tty-0bd5b5200af5628ed6d841139c44cf3dabee8e3e.tar.gz | |
Use DiscoIdentity in EntityCapabilities
Diffstat (limited to 'src/ui/window.c')
| -rw-r--r-- | src/ui/window.c | 40 |
1 files changed, 22 insertions, 18 deletions
diff --git a/src/ui/window.c b/src/ui/window.c index b62c5e86..6e405563 100644 --- a/src/ui/window.c +++ b/src/ui/window.c @@ -765,25 +765,27 @@ win_show_occupant_info(ProfWin *window, const char *const room, Occupant *occupa if (caps) { // show identity - if (caps->category || caps->type || caps->name) { + if (caps->identity) { + DiscoIdentity *identity = caps->identity; win_print(window, '!', 0, NULL, NO_EOL, 0, "", " Identity: "); - if (caps->name) { - win_print(window, '!', 0, NULL, NO_DATE | NO_EOL, 0, "", caps->name); - if (caps->category || caps->type) { + if (identity->name) { + win_print(window, '!', 0, NULL, NO_DATE | NO_EOL, 0, "", identity->name); + if (identity->category || identity->type) { win_print(window, '-', 0, NULL, NO_DATE | NO_EOL, 0, "", " "); } } - if (caps->type) { - win_print(window, '!', 0, NULL, NO_DATE | NO_EOL, 0, "", caps->type); - if (caps->category) { + if (identity->type) { + win_print(window, '!', 0, NULL, NO_DATE | NO_EOL, 0, "", identity->type); + if (identity->category) { win_print(window, '!', 0, NULL, NO_DATE | NO_EOL, 0, "", " "); } } - if (caps->category) { - win_print(window, '!', 0, NULL, NO_DATE | NO_EOL, 0, "", caps->category); + if (identity->category) { + win_print(window, '!', 0, NULL, NO_DATE | NO_EOL, 0, "", identity->category); } win_newline(window); } + if (caps->software) { win_vprint(window, '!', 0, NULL, NO_EOL, 0, "", " Software: %s", caps->software); } @@ -883,25 +885,27 @@ win_show_info(ProfWin *window, PContact contact) if (caps) { // show identity - if (caps->category || caps->type || caps->name) { + if (caps->identity) { + DiscoIdentity *identity = caps->identity; win_print(window, '-', 0, NULL, NO_EOL, 0, "", " Identity: "); - if (caps->name) { - win_print(window, '-', 0, NULL, NO_DATE | NO_EOL, 0, "", caps->name); - if (caps->category || caps->type) { + if (identity->name) { + win_print(window, '-', 0, NULL, NO_DATE | NO_EOL, 0, "", identity->name); + if (identity->category || identity->type) { win_print(window, '-', 0, NULL, NO_DATE | NO_EOL, 0, "", " "); } } - if (caps->type) { - win_print(window, '-', 0, NULL, NO_DATE | NO_EOL, 0, "", caps->type); - if (caps->category) { + if (identity->type) { + win_print(window, '-', 0, NULL, NO_DATE | NO_EOL, 0, "", identity->type); + if (identity->category) { win_print(window, '-', 0, NULL, NO_DATE | NO_EOL, 0, "", " "); } } - if (caps->category) { - win_print(window, '-', 0, NULL, NO_DATE | NO_EOL, 0, "", caps->category); + if (identity->category) { + win_print(window, '-', 0, NULL, NO_DATE | NO_EOL, 0, "", identity->category); } win_newline(window); } + if (caps->software) { win_vprint(window, '-', 0, NULL, NO_EOL, 0, "", " Software: %s", caps->software); } |