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

Show detailed software/os information if available in capabilities

Browse Source
This commit is contained in:
James Booth
2013-02-05 23:06:30 +00:00
parent 895399427e
commit 5e5590b047
6 changed files with 150 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
src/ui/windows.c
View File

@@ -2427,28 +2427,26 @@ _win_show_info(WINDOW *win, PContact pcontact)
wprintw(win, "\n");
_win_show_time(win, '-');
_presence_colour_on(win, presence);
wprintw(win, "%s:\n", jid);
_presence_colour_off(win, presence);
wprintw(win, "%s", jid);
if (name != NULL) {
_win_show_time(win, '-');
wprintw(win, "Name : %s\n", name);
}
if (sub != NULL) {
_win_show_time(win, '-');
wprintw(win, "Subscription : %s\n", sub);
wprintw(win, " (%s)", name);
}
wprintw(win, ":\n");
_presence_colour_off(win, presence);
_win_show_time(win, '-');
wprintw(win, "Presence : ");
_presence_colour_on(win, presence);
wprintw(win, "%s\n", presence);
wprintw(win, "%s", presence);
if (status != NULL) {
wprintw(win, ", \"%s\"", status);
}
wprintw(win, "\n");
_presence_colour_off(win, presence);
if (status != NULL) {
if (sub != NULL) {
_win_show_time(win, '-');
wprintw(win, "Message : %s\n", status);
wprintw(win, "Subscription : %s\n", sub);
}
if (last_activity != NULL) {
@@ -2478,9 +2476,48 @@ _win_show_info(WINDOW *win, PContact pcontact)
if (caps_str != NULL) {
Capabilities *caps = caps_get(caps_str);
if ((caps != NULL) && (caps->client != NULL)) {
_win_show_time(win, '-');
wprintw(win, "Client : %s\n", caps->client);
if (caps != NULL) {
// show identity
if ((caps->category != NULL) || (caps->type != NULL) || (caps->name != NULL)) {
_win_show_time(win, '-');
wprintw(win, "Identity : ");
if (caps->name != NULL) {
wprintw(win, "%s", caps->name);
if ((caps->category != NULL) || (caps->type != NULL)) {
wprintw(win, " ");
}
}
if (caps->type != NULL) {
wprintw(win, "%s", caps->type);
if (caps->category != NULL) {
wprintw(win, " ");
}
}
if (caps->category != NULL) {
wprintw(win, "%s", caps->category);
}
wprintw(win, "\n");
}
if (caps->software != NULL) {
_win_show_time(win, '-');
wprintw(win, "Software : %s", caps->software);
}
if (caps->software_version != NULL) {
wprintw(win, ", %s", caps->software_version);
}
if ((caps->software != NULL) || (caps->software_version != NULL)) {
wprintw(win, "\n");
}
if (caps->os != NULL) {
_win_show_time(win, '-');
wprintw(win, "OS : %s", caps->os);
}
if (caps->os_version != NULL) {
wprintw(win, ", %s\n", caps->os_version);
}
if ((caps->os != NULL) || (caps->os_version != NULL)) {
wprintw(win, "\n");
}
}
}