From b9dedbdc1548c09e515dd1388149c494bf2e4dda Mon Sep 17 00:00:00 2001 From: James Booth Date: Sun, 21 Apr 2013 00:50:38 +0100 Subject: Moved cons_show_software_version() to console module --- src/ui/console.c | 28 ++++++++++++++++++++++++++++ src/ui/windows.c | 23 ----------------------- 2 files changed, 28 insertions(+), 23 deletions(-) diff --git a/src/ui/console.c b/src/ui/console.c index 54533ec5..425b6f3a 100644 --- a/src/ui/console.c +++ b/src/ui/console.c @@ -460,6 +460,34 @@ cons_show_caps(const char * const contact, Resource *resource) } } +void +cons_show_software_version(const char * const jid, const char * const presence, + const char * const name, const char * const version, const char * const os) +{ + if ((name != NULL) || (version != NULL) || (os != NULL)) { + cons_show(""); + window_show_time(console, '-'); + window_presence_colour_on(console, presence); + wprintw(console->win, "%s", jid); + window_presence_colour_off(console, presence); + wprintw(console->win, ":\n"); + } + if (name != NULL) { + cons_show("Name : %s", name); + } + if (version != NULL) { + cons_show("Version : %s", version); + } + if (os != NULL) { + cons_show("OS : %s", os); + } + + dirty = TRUE; + if (!win_current_is_console()) { + status_bar_new(0); + } +} + static void _cons_splash_logo(void) { diff --git a/src/ui/windows.c b/src/ui/windows.c index 8dd9c1d1..529c9a0e 100644 --- a/src/ui/windows.c +++ b/src/ui/windows.c @@ -1106,29 +1106,6 @@ win_show_room_broadcast(const char * const room_jid, const char * const message) } } -void -cons_show_software_version(const char * const jid, const char * const presence, - const char * const name, const char * const version, const char * const os) -{ - if ((name != NULL) || (version != NULL) || (os != NULL)) { - cons_show(""); - window_show_time(console, '-'); - window_presence_colour_on(console, presence); - wprintw(console->win, "%s", jid); - window_presence_colour_off(console, presence); - wprintw(console->win, ":\n"); - } - if (name != NULL) { - cons_show("Name : %s", name); - } - if (version != NULL) { - cons_show("Version : %s", version); - } - if (os != NULL) { - cons_show("OS : %s", os); - } -} - void cons_show_room_list(GSList *rooms, const char * const conference_node) { -- cgit 1.4.1-2-gfad0