devs/cproof
1
2
Fork 1
Code Issues 43 Pull Requests 9 Actions Packages Projects 1 Releases Wiki Activity

Use DiscoIdentity in EntityCapabilities

Browse Source
This commit is contained in:
James Booth
2016-08-13 17:19:24 +01:00
parent 80eb5bee90
commit 0bd5b5200a
4 changed files with 133 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/ui/console.c
View File

@@ -558,25 +558,27 @@ cons_show_caps(const char *const fulljid, resource_presence_t presence)
win_print(console, '-', 0, NULL, NO_DATE, 0, "", ":");
// show identity
if (caps->category || caps->type || caps->name) {
if (caps->identity) {
DiscoIdentity *identity = caps->identity;
win_print(console, '-', 0, NULL, NO_EOL, 0, "", "Identity: ");
if (caps->name) {
win_print(console, '-', 0, NULL, NO_DATE | NO_EOL, 0, "", caps->name);
if (caps->category || caps->type) {
if (identity->name) {
win_print(console, '-', 0, NULL, NO_DATE | NO_EOL, 0, "", identity->name);
if (identity->category || identity->type) {
win_print(console, '-', 0, NULL, NO_DATE | NO_EOL, 0, "", " ");
}
}
if (caps->type) {
win_print(console, '-', 0, NULL, NO_DATE | NO_EOL, 0, "", caps->type);
if (caps->category) {
if (identity->type) {
win_print(console, '-', 0, NULL, NO_DATE | NO_EOL, 0, "", identity->type);
if (identity->category) {
win_print(console, '-', 0, NULL, NO_DATE | NO_EOL, 0, "", " ");
}
}
if (caps->category) {
win_print(console, '-', 0, NULL, NO_DATE | NO_EOL, 0, "", caps->category);
if (identity->category) {
win_print(console, '-', 0, NULL, NO_DATE | NO_EOL, 0, "", identity->category);
}
win_newline(console);
}
if (caps->software) {
win_vprint(console, '-', 0, NULL, NO_EOL, 0, "", "Software: %s", caps->software);
}
@@ -1007,25 +1009,27 @@ cons_show_account(ProfAccount *account)
if (caps) {
// show identity
if (caps->category || caps->type || caps->name) {
if (caps->identity) {
DiscoIdentity *identity = caps->identity;
win_print(console, '-', 0, NULL, NO_EOL, 0, "", " Identity: ");
if (caps->name) {
win_print(console, '-', 0, NULL, NO_DATE | NO_EOL, 0, "", caps->name);
if (caps->category || caps->type) {
if (identity->name) {
win_print(console, '-', 0, NULL, NO_DATE | NO_EOL, 0, "", identity->name);
if (identity->category || identity->type) {
win_print(console, '-', 0, NULL, NO_DATE | NO_EOL, 0, "", " ");
}
}
if (caps->type) {
win_print(console, '-', 0, NULL, NO_DATE | NO_EOL, 0, "", caps->type);
if (caps->category) {
if (identity->type) {
win_print(console, '-', 0, NULL, NO_DATE | NO_EOL, 0, "", identity->type);
if (identity->category) {
win_print(console, '-', 0, NULL, NO_DATE | NO_EOL, 0, "", " ");
}
}
if (caps->category) {
win_print(console, '-', 0, NULL, NO_DATE | NO_EOL, 0, "", caps->category);
if (identity->category) {
win_print(console, '-', 0, NULL, NO_DATE | NO_EOL, 0, "", identity->category);
}
win_newline(console);
}
if (caps->software) {
win_vprint(console, '-', 0, NULL, NO_EOL, 0, "", " Software: %s", caps->software);
}

40
src/ui/window.c
View File

@@ -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);
}